From 039a2d006b7349822509ae612f41e24b12b631a6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 22 Jul 2011 14:15:20 +0100 Subject: conf/machine/tune: Overhaul tune include file variables There is currently consideradble confusion over how the tune files operate and how these interact with the rest of the build system. This update/overhaul changes things so the tune files are primarily resonsible for setting: TUNE_ARCH - What was formerly set as TARGET_ARCH and is the value that represents the architecture we're targetting. TUNE_PKGARCH - The value that represents the tune confuration that this set of tune parameters results in. This allows the significant improvement that the core can now always determine the target architecture value, even when TARGET_ARCH needs to be reset to something different and likewise, there is one package architecture variable the core can reference allowing simplification of the BASE_PACKAGE_ARCH, PACKAGE_ARCH and FEED_ARCH variables. (From OE-Core rev: a10de4cf8b424ee95c8e283e75d486be5b3b8eac) Signed-off-by: Richard Purdie --- meta/conf/machine/qemux86-64.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/conf/machine/qemux86-64.conf') diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index ca91388978..46d7d1270d 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -10,6 +10,7 @@ PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +require conf/machine/include/tune-x86_64.inc require conf/machine/include/qemu.inc MACHINE_FEATURES += "x86" @@ -31,5 +32,3 @@ GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" - -TARGET_CC_ARCH = "-m64" -- cgit 1.2.3-korg