| Index: pylib/gyp/generator/make.py
|
| ===================================================================
|
| --- pylib/gyp/generator/make.py (revision 1718)
|
| +++ pylib/gyp/generator/make.py (working copy)
|
| @@ -246,6 +246,14 @@
|
|
|
| %(make_global_settings)s
|
|
|
| +CC.target ?= %(CC.target)s
|
| +CFLAGS.target ?= $(CFLAGS)
|
| +CXX.target ?= %(CXX.target)s
|
| +CXXFLAGS.target ?= $(CXXFLAGS)
|
| +LINK.target ?= %(LINK.target)s
|
| +LDFLAGS.target ?= $(LDFLAGS)
|
| +AR.target ?= $(AR)
|
| +
|
| # C++ apps need to be linked with g++.
|
| #
|
| # Note: flock is used to seralize linking. Linking is a memory-intensive
|
| @@ -257,14 +265,6 @@
|
| # This will allow make to invoke N linker processes as specified in -jN.
|
| LINK ?= %(flock)s $(builddir)/linker.lock $(CXX.target)
|
|
|
| -CC.target ?= %(CC.target)s
|
| -CFLAGS.target ?= $(CFLAGS)
|
| -CXX.target ?= %(CXX.target)s
|
| -CXXFLAGS.target ?= $(CXXFLAGS)
|
| -LINK.target ?= %(LINK.target)s
|
| -LDFLAGS.target ?= $(LDFLAGS)
|
| -AR.target ?= $(AR)
|
| -
|
| # TODO(evan): move all cross-compilation logic to gyp-time so we don't need
|
| # to replicate this environment fallback in make as well.
|
| CC.host ?= %(CC.host)s
|
| @@ -2000,11 +2000,11 @@
|
| 'CC.target': GetEnvironFallback(('CC_target', 'CC'), '$(CC)'),
|
| 'AR.target': GetEnvironFallback(('AR_target', 'AR'), '$(AR)'),
|
| 'CXX.target': GetEnvironFallback(('CXX_target', 'CXX'), '$(CXX)'),
|
| - 'LINK.target': GetEnvironFallback(('LD_target', 'LD'), '$(LINK)'),
|
| + 'LINK.target': GetEnvironFallback(('LINK_target', 'LINK'), '$(LINK)'),
|
| 'CC.host': GetEnvironFallback(('CC_host',), 'gcc'),
|
| 'AR.host': GetEnvironFallback(('AR_host',), 'ar'),
|
| 'CXX.host': GetEnvironFallback(('CXX_host',), 'g++'),
|
| - 'LINK.host': GetEnvironFallback(('LD_host',), 'g++'),
|
| + 'LINK.host': GetEnvironFallback(('LINK_host',), '$(CXX.host)'),
|
| })
|
|
|
| build_file, _, _ = gyp.common.ParseQualifiedTarget(target_list[0])
|
|
|