diff options
author | Richard Purdie <richard@openedhand.com> | 2008-05-16 09:06:00 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-05-16 09:06:00 +0000 |
commit | 3c35b00196661077b6f5a6e996c34c9b5d8c244f (patch) | |
tree | 99627e360537a116bc097b2d503bebe80c04e60d /meta/packages/gcc/gcc-configure-common.inc | |
parent | 4c664f698ca1fe0d0e04f581d01d024757fdad8a (diff) | |
download | poky-3c35b00196661077b6f5a6e996c34c9b5d8c244f.tar.gz |
gcc: Sync with OE.dev
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4485 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gcc/gcc-configure-common.inc')
-rw-r--r-- | meta/packages/gcc/gcc-configure-common.inc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/packages/gcc/gcc-configure-common.inc b/meta/packages/gcc/gcc-configure-common.inc index 9971c08c20..d9bd40092c 100644 --- a/meta/packages/gcc/gcc-configure-common.inc +++ b/meta/packages/gcc/gcc-configure-common.inc | |||
@@ -13,6 +13,9 @@ JAVA_sh3 ?= "" | |||
13 | FORTRAN ?= ",f77" | 13 | FORTRAN ?= ",f77" |
14 | LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" | 14 | LANGUAGES ?= "c,c++${FORTRAN}${JAVA}" |
15 | 15 | ||
16 | EXTRA_OECONF_BASE ?= "" | ||
17 | EXTRA_OECONF_PATHS ?= "" | ||
18 | |||
16 | EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ | 19 | EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \ |
17 | --with-gnu-ld \ | 20 | --with-gnu-ld \ |
18 | --enable-shared \ | 21 | --enable-shared \ |
@@ -25,6 +28,8 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, | |||
25 | --enable-symvers=gnu \ | 28 | --enable-symvers=gnu \ |
26 | --enable-libstdcxx-pch \ | 29 | --enable-libstdcxx-pch \ |
27 | --program-prefix=${TARGET_PREFIX} \ | 30 | --program-prefix=${TARGET_PREFIX} \ |
31 | ${EXTRA_OECONF_BASE} \ | ||
32 | ${EXTRA_OECONF_FPU} \ | ||
28 | ${EXTRA_OECONF_PATHS}" | 33 | ${EXTRA_OECONF_PATHS}" |
29 | 34 | ||
30 | # Build uclibc compilers without cxa_atexit support | 35 | # Build uclibc compilers without cxa_atexit support |
@@ -32,16 +37,12 @@ EXTRA_OECONF_append_linux = " --enable-__cxa_atexit" | |||
32 | EXTRA_OECONF_append_linux-gnueabi = " --enable-__cxa_atexit" | 37 | EXTRA_OECONF_append_linux-gnueabi = " --enable-__cxa_atexit" |
33 | EXTRA_OECONF_append_linux-uclibc = " --disable-__cxa_atexit" | 38 | EXTRA_OECONF_append_linux-uclibc = " --disable-__cxa_atexit" |
34 | EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit" | 39 | EXTRA_OECONF_append_linux-uclibcgnueabi = " --disable-__cxa_atexit" |
35 | EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}" | 40 | EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}" |
36 | CPPFLAGS = "" | 41 | CPPFLAGS = "" |
37 | 42 | ||
38 | # Used by configure to define additional values for FLAGS_FOR_TARGET - | 43 | # Used by configure to define additional values for FLAGS_FOR_TARGET - |
39 | # passed to all the compilers. | 44 | # passed to all the compilers. |
40 | ARCH_FLAGS_FOR_TARGET = "" | 45 | ARCH_FLAGS_FOR_TARGET = "${TARGET_CC_ARCH}" |
41 | #NOTE: not tested on other platforms, the following is probably correct | ||
42 | # everywhere! | ||
43 | ARCH_FLAGS_FOR_TARGET_slugos = "${TARGET_CC_ARCH}" | ||
44 | ARCH_FLAGS_FOR_TARGET_unslung = "${TARGET_CC_ARCH}" | ||
45 | EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'" | 46 | EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'" |
46 | 47 | ||
47 | do_configure () { | 48 | do_configure () { |