diff options
-rw-r--r-- | meta/classes/cross.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/native.bbclass | 1 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 2 |
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}" 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 ''}" |