summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-24 15:10:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-30 13:01:21 +0000
commit678e8798ebe0f4fd1bd347db136f1499b8fe00c9 (patch)
tree4bb321fc618c238832f2fb30008714c6c0a16f73 /meta
parent4faca22b8fe63a86d820990207aaf84b3fa83e01 (diff)
downloadpoky-678e8798ebe0f4fd1bd347db136f1499b8fe00c9.tar.gz
gcc: poison default sysroot path
Various pieces of the code assume that the --sysroot option gets passed into the compiler tools. By having a "sane" default, we don't always spot when this occurs and this can later show up as breakage in sstate, or in usage of the external toolchain. We've long since talked about poisoning the default such that it will break unless the correct option is specified. This patch does just that. If this patch causes something to fail to build, it most likely means the various compiler flags and commands are not correctly being passed through to the underlying piece of software and that there is a real problem that needs fixing, its not the fault of this patch. (From OE-Core rev: 04b725511a505c582a3abdf63d096967f0320779) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-4.9.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc4
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc2
-rw-r--r--meta/recipes-devtools/gcc/libgfortran.inc2
6 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc
index 9a66cd294f..c47f244180 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -122,8 +122,8 @@ EXTRA_OECONF_INTERMEDIATE = "\
122EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float " 122EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float "
123 123
124EXTRA_OECONF_PATHS = "\ 124EXTRA_OECONF_PATHS = "\
125 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ 125 --with-gxx-include-dir=/not/exist{target_includedir}/c++/${BINV} \
126 --with-sysroot=${STAGING_DIR_TARGET} \ 126 --with-sysroot=/not/exist \
127 --with-build-sysroot=${STAGING_DIR_TARGET} \ 127 --with-build-sysroot=${STAGING_DIR_TARGET} \
128" 128"
129 129
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 0b1f37b908..1a63f82722 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -10,9 +10,9 @@ GCCMULTILIB = "--enable-multilib"
10require gcc-configure-common.inc 10require gcc-configure-common.inc
11 11
12EXTRA_OECONF_PATHS = "\ 12EXTRA_OECONF_PATHS = "\
13 --with-gxx-include-dir=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}${target_includedir}/c++/${BINV} \ 13 --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \
14 --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \ 14 --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
15 --with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ 15 --with-sysroot=/not/exist \
16 --with-build-sysroot=${STAGING_DIR_TARGET} \ 16 --with-build-sysroot=${STAGING_DIR_TARGET} \
17" 17"
18# We have to point gcc at a sysroot but we don't need to rebuild if this changes 18# We have to point gcc at a sysroot but we don't need to rebuild if this changes
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 6e2f25b562..7197447080 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -21,7 +21,7 @@ EXTRA_OECONF = "\
21 --enable-languages=c \ 21 --enable-languages=c \
22 ${OPTSPACE} \ 22 ${OPTSPACE} \
23 --program-prefix=${TARGET_PREFIX} \ 23 --program-prefix=${TARGET_PREFIX} \
24 --with-sysroot=${STAGING_DIR_TARGET} \ 24 --with-sysroot=/not/exist \
25 --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \ 25 --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \
26 ${EXTRA_OECONF_INITIAL} \ 26 ${EXTRA_OECONF_INITIAL} \
27 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \ 27 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 4cdb55f3ee..9147acd1a8 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -25,8 +25,8 @@ EXTRA_OECONF += "\
25" 25"
26 26
27EXTRA_OECONF_PATHS = "\ 27EXTRA_OECONF_PATHS = "\
28 --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ 28 --with-gxx-include-dir=/not/exist${target_includedir}/c++/${BINV} \
29 --with-sysroot=${STAGING_DIR_TARGET} \ 29 --with-sysroot=/not/exist \
30 --with-build-sysroot=${STAGING_DIR_TARGET} \ 30 --with-build-sysroot=${STAGING_DIR_TARGET} \
31" 31"
32 32
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 167869e1f2..0348bc4607 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -4,7 +4,7 @@ CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
4 4
5EXTRA_OECONF_PATHS = "\ 5EXTRA_OECONF_PATHS = "\
6 --with-gxx-include-dir=${includedir}/c++/${BINV} \ 6 --with-gxx-include-dir=${includedir}/c++/${BINV} \
7 --with-sysroot=${STAGING_DIR_TARGET} \ 7 --with-sysroot=/not/exist \
8 --with-build-sysroot=${STAGING_DIR_TARGET} \ 8 --with-build-sysroot=${STAGING_DIR_TARGET} \
9" 9"
10 10
diff --git a/meta/recipes-devtools/gcc/libgfortran.inc b/meta/recipes-devtools/gcc/libgfortran.inc
index cf7942f41d..e42843d2f1 100644
--- a/meta/recipes-devtools/gcc/libgfortran.inc
+++ b/meta/recipes-devtools/gcc/libgfortran.inc
@@ -1,7 +1,7 @@
1require gcc-configure-common.inc 1require gcc-configure-common.inc
2 2
3EXTRA_OECONF_PATHS = "\ 3EXTRA_OECONF_PATHS = "\
4 --with-sysroot=${STAGING_DIR_TARGET} \ 4 --with-sysroot=/not/exist \
5 --with-build-sysroot=${STAGING_DIR_TARGET} \ 5 --with-build-sysroot=${STAGING_DIR_TARGET} \
6" 6"
7 7