Skip to content

Commit 59e1ea4

Browse files
committed
fixup
1 parent 31c4b8c commit 59e1ea4

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

gyp/pylib/gyp/generator/make.py

+7
Original file line numberDiff line numberDiff line change
@@ -1949,6 +1949,13 @@ def ExpandInputRoot(self, template, expansion, dirname):
19491949

19501950
def _InstallableTargetInstallPath(self):
19511951
"""Returns the location of the final output for an installable target."""
1952+
# Xcode puts shared_library results into PRODUCT_DIR, and some gyp files
1953+
# rely on this. Emulate this behavior for mac.
1954+
if (self.type == 'shared_library' and
1955+
(self.flavor != 'mac' or self.toolset != 'target')):
1956+
# Install all shared libs into a common directory (per toolset) for
1957+
# convenient access with LD_LIBRARY_PATH.
1958+
return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias)
19521959
return '$(builddir)/' + self.alias
19531960

19541961

0 commit comments

Comments
 (0)