1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade GYP to r999

Browse Source 
To fix osx/make build http://codereview.chromium.org/7618052
This commit is contained in:
Ryan Dahl 2011-08-15 15:47:16 -07:00
parent 66f77963a3
commit 721f26520d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/gyp/pylib/gyp/generator/make.py
View File

@ -1239,12 +1239,11 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
self.WriteLn('quiet_cmd_%s = ACTION %s $@' % (name, name)) self.WriteLn('quiet_cmd_%s = ACTION %s $@' % (name, name))
if len(dirs) > 0: if len(dirs) > 0:
command = 'mkdir -p %s' % ' '.join(dirs) + '; ' + command command = 'mkdir -p %s' % ' '.join(dirs) + '; ' + command
cd_action = 'cd %s; ' % Sourceify(self.path or '.')
# Set LD_LIBRARY_PATH in case the action runs an executable from this # Set LD_LIBRARY_PATH in case the action runs an executable from this
# build which links to shared libs from this build. # build which links to shared libs from this build.
if self.path:
cd_action = 'cd %s; ' % Sourceify(self.path)
else:
cd_action = ''
# actions run on the host, so they should in theory only use host # actions run on the host, so they should in theory only use host
# libraries, but until everything is made cross-compile safe, also use # libraries, but until everything is made cross-compile safe, also use
# target libraries. # target libraries.
@ -1350,10 +1349,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
mkdirs = '' mkdirs = ''
if len(dirs) > 0: if len(dirs) > 0:
mkdirs = 'mkdir -p %s; ' % ' '.join(dirs) mkdirs = 'mkdir -p %s; ' % ' '.join(dirs)
if self.path: cd_action = 'cd %s; ' % Sourceify(self.path or '.')
cd_action = 'cd %s; ' % Sourceify(self.path)
else:
cd_action = ''
# Set LD_LIBRARY_PATH in case the rule runs an executable from this # Set LD_LIBRARY_PATH in case the rule runs an executable from this
# build which links to shared libs from this build. # build which links to shared libs from this build.
# rules run on the host, so they should in theory only use host # rules run on the host, so they should in theory only use host