[Pkg-chromium-maint] [PATCH] Add LINK.host to BUILD_ARGS to prevent build failures
Andrew Chant
achant at google.com
Thu May 31 14:58:43 UTC 2012
The default Makefile produced by gyp defines "LINK.host ?= g++".
This causes runtime errors during the build if g++ isn't identical
to the CXX and CC versions used.
This patch updates debian/rules to define LINK.host wherever CXX.host
and CC.host are defined.
Tested:
Built chromium-20.0.1132.17~r138701 with gcc-4.6 but with g++
pointing to g++-4.7. Prior to fix, build would crash with
"Floating point exception" whenever protoc was run.
---
debian/rules | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/rules b/debian/rules
index 6b2b2d8..190b6fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -160,20 +160,20 @@ CC_VERSION := $(shell gcc -dumpversion | cut -d. -f-2)
ifeq (1/4.4,$(AVOID_GCC_44)/$(CC_VERSION))
CC := gcc-4.3
CXX := g++-4.3
-BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX)
+BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX) LINK.host=$(CXX)
endif
ifeq (1/4.6,$(AVOID_GCC_46)/$(CC_VERSION))
CC := gcc-4.5
CXX := g++-4.5
-BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX)
+BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX) LINK.host=$(CXX)
endif
ifeq (1/4.7,$(AVOID_GCC_47)/$(CC_VERSION))
CC := gcc-4.6
CXX := g++-4.6
-BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX)
+BUILD_ARGS += CC=$(CC) CXX=$(CXX) CC.host=$(CC) CXX.host=$(CXX) LINK.host=$(CXX)
endif
ifeq (0/4.6,$(AVOID_GCC_46)/$(CC_VERSION))
--
1.7.10
More information about the Pkg-chromium-maint
mailing list