From 721f26520d7781e0ffe8a94d531b8c1a76118a8d Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Mon, 15 Aug 2011 15:47:16 -0700 Subject: [PATCH] Upgrade GYP to r999 To fix osx/make build http://codereview.chromium.org/7618052 --- tools/gyp/pylib/gyp/generator/make.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py index 4ed6b6e..9862984 100644 --- a/tools/gyp/pylib/gyp/generator/make.py +++ b/tools/gyp/pylib/gyp/generator/make.py @@ -1239,12 +1239,11 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD self.WriteLn('quiet_cmd_%s = ACTION %s $@' % (name, name)) if len(dirs) > 0: 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 # 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 # libraries, but until everything is made cross-compile safe, also use # target libraries. @@ -1350,10 +1349,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD mkdirs = '' if len(dirs) > 0: mkdirs = 'mkdir -p %s; ' % ' '.join(dirs) - if self.path: - cd_action = 'cd %s; ' % Sourceify(self.path) - else: - cd_action = '' + cd_action = 'cd %s; ' % Sourceify(self.path or '.') # Set LD_LIBRARY_PATH in case the rule runs an executable from this # build which links to shared libs from this build. # rules run on the host, so they should in theory only use host -- 2.7.4