| 1234567891011121314151617181920212223242526272829 |
- From 90a3c113c19ec615249ab880c45c6c0a8d369098 Mon Sep 17 00:00:00 2001
- From: Martin Bark <martin@barkynet.com>
- Date: Tue, 30 Jun 2015 09:43:47 +0100
- Subject: [PATCH 2/4] gyp: force link command to use CXX
- Signed-off-by: Samuel Martin <s.martin49@gmail.com>
- Signed-off-by: Martin Bark <martin@barkynet.com>
- [yann.morin.1998@free.fr: adapt to 4.1.2]
- Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
- ---
- tools/gyp/pylib/gyp/generator/make.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
- diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py
- index b88a433..0a1f2e0 100644
- --- a/tools/gyp/pylib/gyp/generator/make.py
- +++ b/tools/gyp/pylib/gyp/generator/make.py
- @@ -142,7 +142,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
- # special "figure out circular dependencies" flags around the entire
- # input list during linking.
- quiet_cmd_link = LINK($(TOOLSET)) $@
- -cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
- +cmd_link = $(CXX.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
-
- # We support two kinds of shared objects (.so):
- # 1) shared_library, which is just bundling together many dependent libraries
- --
- 2.1.4
|
