diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2011-10-26 04:59:31 +0000 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2011-10-26 04:59:31 +0000 |
| commit | d7dff34bad8544602d0b26414b836dbf9705f05e (patch) | |
| tree | 9dea69b087c7e4c966ee44ac6d8f28c753a8d748 /tools/gyp/pylib/gyp/generator/make.py | |
| parent | b8847e9ac6d71deaf4cc09e27f913fac1344ad0f (diff) | |
| download | android-node-v8-d7dff34bad8544602d0b26414b836dbf9705f05e.tar.gz android-node-v8-d7dff34bad8544602d0b26414b836dbf9705f05e.tar.bz2 android-node-v8-d7dff34bad8544602d0b26414b836dbf9705f05e.zip | |
gyp: support older bash versions
Older bash versions in `sh -c` mode don't parse `export FOO=42` constructs,
they bail out with a "FOO is not an identifier" error message.
This was fixed somewhere between bash 4.1.0 and 4.1.5 but let's support the
older versions anyway.
Diffstat (limited to 'tools/gyp/pylib/gyp/generator/make.py')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/make.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py index 23ca939469..1007672ad8 100644 --- a/tools/gyp/pylib/gyp/generator/make.py +++ b/tools/gyp/pylib/gyp/generator/make.py @@ -1505,8 +1505,10 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD # libraries, but until everything is made cross-compile safe, also use # target libraries. # TODO(piman): when everything is cross-compile safe, remove lib.target - self.WriteLn('cmd_%s = export LD_LIBRARY_PATH=$(builddir)/lib.host:' - '$(builddir)/lib.target:$$LD_LIBRARY_PATH; %s%s' + self.WriteLn('cmd_%s = LD_LIBRARY_PATH=$(builddir)/lib.host:' + '$(builddir)/lib.target:$$LD_LIBRARY_PATH; ' + 'export LD_LIBRARY_PATH; ' + '%s%s' % (name, cd_action, command)) self.WriteLn() outputs = map(self.Absolutify, outputs) @@ -1623,8 +1625,9 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD # target libraries. # TODO(piman): when everything is cross-compile safe, remove lib.target self.WriteLn( - "cmd_%(name)s_%(count)d = export LD_LIBRARY_PATH=" + "cmd_%(name)s_%(count)d = LD_LIBRARY_PATH=" "$(builddir)/lib.host:$(builddir)/lib.target:$$LD_LIBRARY_PATH; " + "export LD_LIBRARY_PATH; " "%(cd_action)s%(mkdirs)s%(action)s" % { 'action': gyp.common.EncodePOSIXShellList(action), 'cd_action': cd_action, |