Skip to content

Commit a2ed0df

Browse files
TooTallNatebnoordhuis
authored andcommitted
gyp: always install into $PRODUCT_DIR
1 parent cc8b2fa commit a2ed0df

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

gyp/pylib/gyp/generator/make.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -1917,11 +1917,13 @@ def _InstallableTargetInstallPath(self):
19171917
"""Returns the location of the final output for an installable target."""
19181918
# Xcode puts shared_library results into PRODUCT_DIR, and some gyp files
19191919
# rely on this. Emulate this behavior for mac.
1920-
if (self.type == 'shared_library' and
1921-
(self.flavor != 'mac' or self.toolset != 'target')):
1922-
# Install all shared libs into a common directory (per toolset) for
1923-
# convenient access with LD_LIBRARY_PATH.
1924-
return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias)
1920+
1921+
# XXX(TooTallNate): disabling this code since we don't want this behavior...
1922+
#if (self.type == 'shared_library' and
1923+
# (self.flavor != 'mac' or self.toolset != 'target')):
1924+
# # Install all shared libs into a common directory (per toolset) for
1925+
# # convenient access with LD_LIBRARY_PATH.
1926+
# return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias)
19251927
return '$(builddir)/' + self.alias
19261928

19271929

0 commit comments

Comments
 (0)