forked from brl/citadel
54 lines
2.2 KiB
Diff
54 lines
2.2 KiB
Diff
|
From 617184f35e97934d9e6268e71378574e2b776c2b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Khem Raj <raj.khem@gmail.com>
|
||
|
|
Date: Fri, 20 Feb 2015 09:40:59 +0000
|
||
|
|
Subject: [PATCH 28/46] export CPP
|
||
|
|
|
||
|
|
The OE environment sets and exports CPP as being the target gcc. When
|
||
|
|
building gcc-cross-canadian for a mingw targetted sdk, the following can be found
|
||
|
|
in build.x86_64-pokysdk-mingw32.i586-poky-linux/build-x86_64-linux/libiberty/config.log:
|
||
|
|
|
||
|
|
configure:3641: checking for _FILE_OFFSET_BITS value needed for large files
|
||
|
|
configure:3666: gcc -c -isystem/media/build1/poky/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe conftest.c >&5
|
||
|
|
configure:3666: $? = 0
|
||
|
|
configure:3698: result: no
|
||
|
|
configure:3786: checking how to run the C preprocessor
|
||
|
|
configure:3856: result: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32
|
||
|
|
configure:3876: x86_64-pokysdk-mingw32-gcc -E --sysroot=/media/build1/poky/build/tmp/sysroots/x86_64-nativesdk-mingw32-pokysdk-mingw32 conftest.c
|
||
|
|
configure:3876: $? = 0
|
||
|
|
|
||
|
|
Note this is a *build* target (in build-x86_64-linux) so it should be
|
||
|
|
using the host "gcc", not x86_64-pokysdk-mingw32-gcc. Since the mingw32
|
||
|
|
headers are very different, using the wrong cpp is a real problem. It is leaking
|
||
|
|
into configure through the CPP variable. Ultimately this leads to build
|
||
|
|
failures related to not being able to include a process.h file for pem-unix.c.
|
||
|
|
|
||
|
|
The fix is to ensure we export a sane CPP value into the build
|
||
|
|
environment when using build targets. We could define a CPP_FOR_BUILD value which may be
|
||
|
|
the version which needs to be upstreamed but for now, this fix is good enough to
|
||
|
|
avoid the problem.
|
||
|
|
|
||
|
|
RP 22/08/2013
|
||
|
|
|
||
|
|
Upstream-Status: Pending
|
||
|
|
|
||
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||
|
|
---
|
||
|
|
Makefile.in | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/Makefile.in b/Makefile.in
|
||
|
|
index 1522e39..beb9b9a 100644
|
||
|
|
--- a/Makefile.in
|
||
|
|
+++ b/Makefile.in
|
||
|
|
@@ -149,6 +149,7 @@ BUILD_EXPORTS = \
|
||
|
|
AR="$(AR_FOR_BUILD)"; export AR; \
|
||
|
|
AS="$(AS_FOR_BUILD)"; export AS; \
|
||
|
|
CC="$(CC_FOR_BUILD)"; export CC; \
|
||
|
|
+ CPP="$(CC_FOR_BUILD) -E"; export CPP; \
|
||
|
|
CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
|
||
|
|
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
||
|
|
CXX="$(CXX_FOR_BUILD)"; export CXX; \
|
||
|
|
--
|
||
|
|
2.8.2
|
||
|
|
|