Skip to content

Commit

Permalink
gyp: always install into $PRODUCT_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
TooTallNate authored and bnoordhuis committed Nov 6, 2015
1 parent cc8b2fa commit a2ed0df
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions gyp/pylib/gyp/generator/make.py
Original file line number Diff line number Diff line change
Expand Up @@ -1917,11 +1917,13 @@ def _InstallableTargetInstallPath(self):
"""Returns the location of the final output for an installable target."""
# Xcode puts shared_library results into PRODUCT_DIR, and some gyp files
# rely on this. Emulate this behavior for mac.
if (self.type == 'shared_library' and
(self.flavor != 'mac' or self.toolset != 'target')):
# Install all shared libs into a common directory (per toolset) for
# convenient access with LD_LIBRARY_PATH.
return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias)

# XXX(TooTallNate): disabling this code since we don't want this behavior...
#if (self.type == 'shared_library' and
# (self.flavor != 'mac' or self.toolset != 'target')):
# # Install all shared libs into a common directory (per toolset) for
# # convenient access with LD_LIBRARY_PATH.
# return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias)
return '$(builddir)/' + self.alias


Expand Down

0 comments on commit a2ed0df

Please sign in to comment.