summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-08-03 14:13:39 -0700
committerTom Rini <tom_rini@mentor.com>2011-08-03 14:13:39 -0700
commit99c2e4faac16aff416aabc92c7582acddefa8599 (patch)
tree08c3454e8df3e2f8d4d79d84987870acb3661ebb
parent6c43ca6fc6a7fffc84cf28684cac0c0eb4129902 (diff)
downloadopenembedded-core-contrib-trini/WIP-fix-build_cc-not-being-single-word.tar.gz
openembedded-core-contrib-trini/WIP-fix-build_cc-not-being-single-word.tar.bz2
openembedded-core-contrib-trini/WIP-fix-build_cc-not-being-single-word.zip
WIP: Updates to use BUILD_CC and not 'gcc' and allow BUILD_CC to have many wordstrini/WIP-fix-build_cc-not-being-single-word
Build-tested for qemux86 and having -m64 in BUILD_CC_ARCH Signed-off-by: Tom Rini <tom_rini@mentor.com>
-rw-r--r--meta/classes/cml1.bbclass2
-rw-r--r--meta/classes/native.bbclass2
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb1
-rw-r--r--meta/recipes-devtools/apt/apt.inc2
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc4
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc2
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.10.bb2
-rw-r--r--meta/site/common4
8 files changed, 18 insertions, 1 deletions
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index 79218b4a12..bc66f44ed4 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -1,3 +1,5 @@
+EXTRA_OEMAKE += '"HOSTCC=${BUILD_CC}"'
+
cml1_do_configure() {
set -e
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 00f7b9f02d..2b15a73c21 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -50,7 +50,7 @@ export CONFIG_SITE = ""
export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}"
export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}"
-export CPP = "${HOST_PREFIX}gcc -E"
+export CPP = "${HOST_PREFIX}gcc ${HOST_CC_ARCH} -E"
export LD = "${HOST_PREFIX}ld"
export CCLD = "${CC}"
export AR = "${HOST_PREFIX}ar"
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
index 08468fe2d7..ee0d803b52 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
@@ -23,6 +23,7 @@ SRC_URI[md5sum] = "1131dc5f27c4f3905a6e7ee0d594fd4d"
SRC_URI[sha256sum] = "5575ece941097cbfa67fbe0d220dfa11b73f5e6d991e7939c9339bd72259ff19"
PARALLEL_MAKE = ""
+export CC_FOR_BUILD="${BUILD_CC}"
# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will
# pull in the remainder of the dependencies.
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index 546683f9bc..b10f86d5e3 100644
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -24,3 +24,5 @@ EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4"
EXTRA_OECONF_append = " ac_cv_glibc_ver=libc6.3"
FILES_${PN}-dbg += "${libdir}/apt/methods/.debug/"
+
+PARALLEL_MAKE = ""
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index ac8a3eb10d..526a3e4f8d 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -16,6 +16,10 @@ EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --di
#EXTRA_OECONF += "--disable-sdl"
+# We cannot use CCLD without further rewrites of qemu's Makefiles and
+# we must ensure ld is linking for 64bit on 64bit.
+EXTRA_OEMAKE_virtclass-native = '${@base_contains("OVERRIDES", "x86_64", "LD='ld -melf_x86_64'", "", d)}'
+EXTRA_OEMAKE_virtclass-nativesdk = '${@base_contains("OVERRIDES", "x86_64", "LD='ld -melf_x86_64'", "", d)}'
inherit autotools
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index 014024f460..4d11b712ca 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -8,3 +8,5 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2"
#DEPENDS = "cross-linkage"
RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
+
+EXTRA_OEMAKE += '"HOSTCC=${BUILD_CC}"'
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
index 6dea0844ef..93caf087d9 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.10.bb
@@ -23,3 +23,5 @@ FILES_${PN} = "${libdir}/lib*.so.*"
FILES_${PN}-dev += "${bindir}/*"
inherit autotools binconfig pkgconfig gettext
+
+export CC_FOR_BUILD="${BUILD_CC}"
diff --git a/meta/site/common b/meta/site/common
index 5da3ff41de..7a1e59e32c 100644
--- a/meta/site/common
+++ b/meta/site/common
@@ -15,3 +15,7 @@ shadow_cv_utmpdir=${localstatedir}/run
shadow_cv_logdir=${localstatedir}/log
shadow_cv_passwd_dir=${bindir}
+# Programs sometimes use a few different checks to see what compiler to use
+# when they know they are cross-compiling and need host utilities.
+ac_cv_prog_CC_FOR_BUILD="${BUILD_CC}"
+ac_cv_prog_CC_BUILD="${BUILD_CC}"