t-head/meta-external-toolchain
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-external-toolchain synced 2026-08-09 23:51:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #152 from kergoth/sourcery-remove-prefix

Browse Source 
Drop the change of TARGET_PREFIX
This commit is contained in:
Noor-Ahsan
2016-12-31 11:13:23 +05:00
committed by GitHub
parent 5762d0e145 2082315ed0
commit 3985fa436d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classes/external-toolchain-cross.bbclass
View File

@@ -11,14 +11,14 @@ wrap_bin () {
for arg in "$@"; do
printf '%s\n' "$arg"
done >>"$script"
printf 'exec ${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}%s "$@"\n' "$bin" >>"$script"
printf 'exec ${EXTERNAL_TOOLCHAIN}/bin/${EXTERNAL_TARGET_SYS}-%s "$@"\n' "$bin" >>"$script"
chmod +x "$script"
}
do_install () {
install -d ${D}${bindir}
for bin in ${EXTERNAL_CROSS_BINARIES}; do
if [ ! -e "${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}$bin" ]; then
if [ ! -e "${EXTERNAL_TOOLCHAIN}/bin/${EXTERNAL_TARGET_SYS}-$bin" ]; then
continue
fi

5
classes/sanity-external-toolchain.bbclass
View File

@@ -26,12 +26,12 @@ def check_toolchain_sanity(d, generate_events=False):
raise_exttc_sanity_error('Unable to locate prefixed gcc binary for %s in EXTERNAL_TOOLCHAIN/bin (%s/bin)' % (d.getVar('TARGET_SYS', True), d.getVar('EXTERNAL_TOOLCHAIN', True)), d, generate_events)
# Test 3: gcc binary exists
gcc = d.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}gcc')
gcc = d.expand('${EXTERNAL_TOOLCHAIN}/bin/${EXTERNAL_TARGET_SYS}-gcc')
if not os.path.exists(gcc):
raise_exttc_sanity_error('Compiler path `%s` does not exist' % gcc, d, generate_events)
# Test 4: we can run it to get the version
cmd = d.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}gcc -dumpversion')
cmd = d.expand('${EXTERNAL_TOOLCHAIN}/bin/${EXTERNAL_TARGET_SYS}-gcc -dumpversion')
sourcery_version = exttc_sanity_run(shlex.split(cmd), d, generate_events)
if cfgdata.get('sourcery_version') == sourcery_version:
return
@@ -46,6 +46,7 @@ def check_toolchain_sanity(d, generate_events=False):
# the external toolchain sysroots for this test
l = d.createCopy()
l.setVar('TOOLCHAIN_OPTIONS', '')
l.setVar('TARGET_PREFIX', '${EXTERNAL_TARGET_SYS}-')
l.setVar('HOST_CC_ARCH_remove', '--no-sysroot-suffix')
cmd = l.expand('${EXTERNAL_TOOLCHAIN}/bin/${CC} ${CFLAGS} ${LDFLAGS} test.c -o test')
exttc_sanity_run(shlex.split(cmd), d, generate_events, tmpdir)

3
conf/distro/include/tcmode-external-sourcery.inc
View File

@@ -124,7 +124,6 @@ BB_HASHBASE_WHITELIST_remove = "EXTERNAL_TOOLCHAIN"
EXTERNAL_TARGET_SYS ?= "${@external_target_sys(d)}"
EXTERNAL_TARGET_SYS[vardepvalue] = "${EXTERNAL_TARGET_SYS}"
EXTERNAL_TARGET_SYS[vardepsexclude] += "EXTERNAL_TARGET_SYSTEMS EXTERNAL_TOOLCHAIN"
TARGET_PREFIX = "${EXTERNAL_TARGET_SYS}-"
# TOOLCHAIN_OPTIONS would seem more appropriate, but that gets added to LD as
# well, and --no-sysroot-suffix only works for gcc, not binutils.
@@ -183,7 +182,7 @@ python toolchain_metadata_setup () {
with tempfile.NamedTemporaryFile(suffix='.c') as f:
try:
subprocess.check_output([d.expand('${EXTERNAL_TOOLCHAIN}/bin/${TARGET_PREFIX}gcc'), '-msgxx-glibc', '-E', f.name], stderr=subprocess.STDOUT, env=testenv, cwd=d.getVar('TOPDIR', True))
subprocess.check_output([d.expand('${EXTERNAL_TOOLCHAIN}/bin/${EXTERNAL_TARGET_SYS}-gcc'), '-msgxx-glibc', '-E', f.name], stderr=subprocess.STDOUT, env=testenv, cwd=d.getVar('TOPDIR', True))
except (OSError, subprocess.CalledProcessError):
pass
else: