You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.5 KiB
35 lines
1.5 KiB
From 9b5e8dc426ada891d67d27b09acc73122ab46849 Mon Sep 17 00:00:00 2001 |
|
From: Nathan Rajlich <nathan@tootallnate.net> |
|
Date: Wed, 14 Nov 2012 16:48:52 -0800 |
|
Subject: [PATCH 1/3] gyp: always install into $PRODUCT_DIR |
|
|
|
--- |
|
gyp/pylib/gyp/generator/make.py | 12 +++++++----- |
|
1 file changed, 7 insertions(+), 5 deletions(-) |
|
|
|
diff --git a/gyp/pylib/gyp/generator/make.py b/gyp/pylib/gyp/generator/make.py |
|
index b88a433..9b3e4e3 100644 |
|
--- a/gyp/pylib/gyp/generator/make.py |
|
+++ b/gyp/pylib/gyp/generator/make.py |
|
@@ -1888,11 +1888,13 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD |
|
"""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 |
|
|
|
|
|
-- |
|
2.3.2 (Apple Git-55) |
|
|
|
|