aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2013-04-09 11:31:15 +0800
committerAndrew Hsieh <andrewhsieh@google.com>2013-04-09 11:31:15 +0800
commit33c45e115f441135639d16ece9a0550208a280bf (patch)
treedf4e57f8b48475c49666b31438bfb8eeb9221e37
parent4ecf441b08bb3f039e3836b7517f079be70583ad (diff)
downloadbuild-33c45e115f441135639d16ece9a0550208a280bf.tar.gz
Fix GCC 4.8 mingw build
Export CXX_FOR_BUILD otherwise the default g++ can have different bitness than libiberty.a which is always built in 32-bit for now. Didn't happen prior to GCC 4.8 because GCC was in C only. GCC from 4.8 now uses C++ as its implementation language Change-Id: I318a2e469e1f1ce5cea71654ca5387d26cee5b73
-rw-r--r--Makefile.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 9a86d55..8f34a69 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -195,6 +195,7 @@ CFLAGS_FOR_BUILD ?= $(CFLAGS)
LDFLAGS_FOR_BUILD ?= $(LDFLAGS)
canadian_build_env := \
export CC_FOR_BUILD=$(cur_build)-gcc ; \
+ export CXX_FOR_BUILD=$(cur_build)-g++ ; \
export CC=$(cur_build)-gcc ; \
export CXX=$(cur_build)-g++ ; \
export CFLAGS="$(CFLAGS_FOR_BUILD)" ; \
@@ -203,6 +204,7 @@ canadian_build_env := \
CANADIAN_ROOT := $(PWD)/host-${cur_build}
canadian_env := \
export CC_FOR_BUILD=$(cur_build)-gcc ; \
+ export CXX_FOR_BUILD=$(cur_build)-g++ ; \
export CC=$(cur_host)-gcc ; \
export CXX=$(cur_host)-g++ ; \
export AR=$(cur_host)-ar ; \