From fc57f9cce3a4f4eb81ddd8b598443ce65fb0972b Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Wed, 9 May 2018 20:14:57 -0700 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/cross.bbclass | 1 - meta/classes/native.bbclass | 1 - meta/conf/bitbake.conf | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'meta') 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}" CFLAGS = "${BUILD_CFLAGS}" CXXFLAGS = "${BUILD_CFLAGS}" LDFLAGS = "${BUILD_LDFLAGS}" -LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}" TOOLCHAIN_OPTIONS = "" 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}" CFLAGS = "${BUILD_CFLAGS}" CXXFLAGS = "${BUILD_CXXFLAGS}" LDFLAGS = "${BUILD_LDFLAGS}" -LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} " STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}" STAGING_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" # # This works for functions as well, they are really just environment variables. # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. -OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" +OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable" LIBCOVERRIDE ?= "" CLASSOVERRIDE ?= "class-target" DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}" -- cgit v1.2.3-54-g00ecf