summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-09 20:14:57 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-22 13:13:33 +0100
commitfc57f9cce3a4f4eb81ddd8b598443ce65fb0972b (patch)
tree599de2f7a9cb009057521e10fef8e2911687da5a /meta
parent2811907b1aefa50cb44c1509996ca8e80c6a84f4 (diff)
downloadpoky-fc57f9cce3a4f4eb81ddd8b598443ce65fb0972b.tar.gz
bitbake.conf: drop _build-${BUILD_OS} over-ride
Building on a host OS other than a recent version of Linux is not recommended or supported. Drop the historical _build-${BUILD_OS} over-ride to avoid giving the impression that other host OS's might be supported. (From OE-Core rev: 428fc39356cb77830de9e0d3f1dbd00f5868290a) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cross.bbclass1
-rw-r--r--meta/classes/native.bbclass1
-rw-r--r--meta/conf/bitbake.conf2
3 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 4e85cab2d1..34d7951f3f 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -37,7 +37,6 @@ CPPFLAGS = "${BUILD_CPPFLAGS}"
37CFLAGS = "${BUILD_CFLAGS}" 37CFLAGS = "${BUILD_CFLAGS}"
38CXXFLAGS = "${BUILD_CFLAGS}" 38CXXFLAGS = "${BUILD_CFLAGS}"
39LDFLAGS = "${BUILD_LDFLAGS}" 39LDFLAGS = "${BUILD_LDFLAGS}"
40LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}"
41 40
42TOOLCHAIN_OPTIONS = "" 41TOOLCHAIN_OPTIONS = ""
43 42
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index ad7e98af17..ddccfe2e1d 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -44,7 +44,6 @@ CPPFLAGS = "${BUILD_CPPFLAGS}"
44CFLAGS = "${BUILD_CFLAGS}" 44CFLAGS = "${BUILD_CFLAGS}"
45CXXFLAGS = "${BUILD_CXXFLAGS}" 45CXXFLAGS = "${BUILD_CXXFLAGS}"
46LDFLAGS = "${BUILD_LDFLAGS}" 46LDFLAGS = "${BUILD_LDFLAGS}"
47LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
48 47
49STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}" 48STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
50STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}" 49STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a772cabdcf..702f498fef 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -735,7 +735,7 @@ DISTRO_NAME ??= "OpenEmbedded"
735# 735#
736# This works for functions as well, they are really just environment variables. 736# This works for functions as well, they are really just environment variables.
737# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. 737# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
738OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" 738OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable"
739LIBCOVERRIDE ?= "" 739LIBCOVERRIDE ?= ""
740CLASSOVERRIDE ?= "class-target" 740CLASSOVERRIDE ?= "class-target"
741DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}" 741DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"