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

gyp: support older bash versions

Browse Source 
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.
This commit is contained in:
Ben Noordhuis 2011-10-26 04:59:31 +00:00
parent b8847e9ac6
commit d7dff34bad
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1505,8 +1505,10 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
# 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.
# TODO(piman): when everything is cross-compile safe, remove lib.target # TODO(piman): when everything is cross-compile safe, remove lib.target
self.WriteLn('cmd_%s = export LD_LIBRARY_PATH=$(builddir)/lib.host:' self.WriteLn('cmd_%s = LD_LIBRARY_PATH=$(builddir)/lib.host:'
'$(builddir)/lib.target:$$LD_LIBRARY_PATH; %s%s' '$(builddir)/lib.target:$$LD_LIBRARY_PATH; '
'export LD_LIBRARY_PATH; '
'%s%s'
% (name, cd_action, command)) % (name, cd_action, command))
self.WriteLn() self.WriteLn()
outputs = map(self.Absolutify, outputs) outputs = map(self.Absolutify, outputs)
@ -1623,8 +1625,9 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
# target libraries. # target libraries.
# TODO(piman): when everything is cross-compile safe, remove lib.target # TODO(piman): when everything is cross-compile safe, remove lib.target
self.WriteLn( 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; " "$(builddir)/lib.host:$(builddir)/lib.target:$$LD_LIBRARY_PATH; "
"export LD_LIBRARY_PATH; "
"%(cd_action)s%(mkdirs)s%(action)s" % { "%(cd_action)s%(mkdirs)s%(action)s" % {
'action': gyp.common.EncodePOSIXShellList(action), 'action': gyp.common.EncodePOSIXShellList(action),
'cd_action': cd_action, 'cd_action': cd_action,