Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...

[vuplus_openembedded] / classes / cross.bbclass

diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index 0f57fe5..7debde6 100644 (file)
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -2,6 +2,13 @@
 # no need for them to be a direct target of 'world'
 EXCLUDE_FROM_WORLD = "1"
 
+# Save PACKAGE_ARCH before changing HOST_ARCH
+OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${OLD_PACKAGE_ARCH}"
+# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it
+OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}"
+BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}"
+
 PACKAGES = ""
 
 HOST_ARCH = "${BUILD_ARCH}"
@@ -9,11 +16,15 @@ HOST_VENDOR = "${BUILD_VENDOR}"
 HOST_OS = "${BUILD_OS}"
 HOST_PREFIX = "${BUILD_PREFIX}"
 HOST_CC_ARCH = "${BUILD_CC_ARCH}"
+HOST_EXEEXT = "${BUILD_EXEEXT}"
 
 CPPFLAGS = "${BUILD_CPPFLAGS}"
 CFLAGS = "${BUILD_CFLAGS}"
 CXXFLAGS = "${BUILD_CFLAGS}"
 LDFLAGS = "${BUILD_LDFLAGS}"
+LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}"
+
+TOOLCHAIN_OPTIONS = ""
 
 # Overrides for paths
 
@@ -32,9 +43,9 @@ datadir = "${prefix}/share"
 sysconfdir = "${prefix}/etc"
 sharedstatedir = "${prefix}/com"
 localstatedir = "${prefix}/var"
-infodir = "${prefix}/info"
-mandir = "${prefix}/man"
-docdir = "${prefix}/doc"
+infodir = "${datadir}/info"
+mandir = "${datadir}/man"
+docdir = "${datadir}/doc"
 servicedir = "${prefix}/srv"
 
 # Architecture dependent paths