aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/apt/apt.inc2
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc4
2 files changed, 6 insertions, 0 deletions
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