summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@gmail.com>2016-07-28 12:56:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-04 15:05:46 +0100
commit7918e73e9c5fe8c8c1c1d341eaa42f2f7d3ddb69 (patch)
tree4d1bff3f5eb5bad2fa0ab42ce6a9bbf55578b555
parent94eb2552cdcbe99ba684780c9a6fbbbe7328c906 (diff)
downloadopenembedded-core-contrib-7918e73e9c5fe8c8c1c1d341eaa42f2f7d3ddb69.tar.gz
openembedded-core-contrib-7918e73e9c5fe8c8c1c1d341eaa42f2f7d3ddb69.tar.bz2
openembedded-core-contrib-7918e73e9c5fe8c8c1c1d341eaa42f2f7d3ddb69.zip
bitbake.conf/toolchain-scripts.bbclass: Remove debug prefix mappings in SDK
CFLAGS/CXXFLAGS in the SDK environment script adds debug-prefix mappings that include staging area/work directories. Remove them since the SDK shouldn't be aware of them. Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/toolchain-scripts.bbclass3
-rw-r--r--meta/conf/bitbake.conf8
2 files changed, 7 insertions, 4 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 32d8c32309..57874f38dc 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -6,6 +6,9 @@ REAL_MULTIMACH_TARGET_SYS ?= "${MULTIMACH_TARGET_SYS}"
TARGET_CC_ARCH_append_libc-uclibc = " -muclibc"
TARGET_CC_ARCH_append_libc-musl = " -mmusl"
+# default debug prefix map isn't valid in the SDK
+DEBUG_PREFIX_MAP = ""
+
# This function creates an environment-setup-script for use in a deployable SDK
toolchain_create_sdk_env_script () {
# Create environment setup script. Remember that $SDKTARGETSYSROOT should
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index af3b1819be..900d2fe259 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -549,11 +549,11 @@ EXTRA_OEMAKE_prepend_task-install = "${PARALLEL_MAKEINST} "
##################################################################
# Optimization flags.
##################################################################
-DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types \
- -fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
- -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
- -fdebug-prefix-map=${STAGING_DIR_HOST}= \
+DEBUG_PREFIX_MAP ?= "-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+ -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
+ -fdebug-prefix-map=${STAGING_DIR_HOST}= \
"
+DEBUG_FLAGS ?= "-g -feliminate-unused-debug-types ${DEBUG_PREFIX_MAP}"
# Disabled until the option works properly -feliminate-dwarf2-dups
FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"