diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-25 00:04:53 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-26 10:44:27 +0000 |
commit | 7c55daec93754349b0c4bac1f788db80a88804f8 (patch) | |
tree | 22c59d16c16f0519cef70301aeab325d4cb85299 /meta/recipes-devtools/gcc/gcc-runtime.inc | |
parent | 1d75635ac53589beccdcb72138bfcd28d82d8d14 (diff) | |
download | poky-7c55daec93754349b0c4bac1f788db80a88804f8.tar.gz |
gcc: Clean up unnecessary variable confusion
SDKPKGSUFFIX could only really be "nativesdk" and TARGET_SYS never contains
that so the code manipulating TARGET_SYS is pointless. I suspect this once
worked against MULTIMACH_TARGET_SYS which would be a different question but
it no longer does. Its been cut and pasted everywhere.
This patch cleans up the variable references to make things a little more
readable.
(From OE-Core rev: 5599cb72d17bce2ba6e2be16ef64d9a388bcfb25)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-runtime.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-runtime.inc | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index 00856ad8bc..745cf74f86 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc | |||
@@ -32,15 +32,14 @@ RUNTIMETARGET = "libssp libstdc++-v3 libgomp libatomic ${RUNTIMELIBITM} \ | |||
32 | 32 | ||
33 | do_configure () { | 33 | do_configure () { |
34 | export CXX="${CXX} -nostdinc++ -nostdlib++" | 34 | export CXX="${CXX} -nostdinc++ -nostdlib++" |
35 | target=${TARGET_SYS} | ||
36 | 35 | ||
37 | for d in libgcc ${RUNTIMETARGET}; do | 36 | for d in libgcc ${RUNTIMETARGET}; do |
38 | echo "Configuring $d" | 37 | echo "Configuring $d" |
39 | rm -rf ${B}/$target/$d/ | 38 | rm -rf ${B}/${TARGET_SYS}/$d/ |
40 | mkdir -p ${B}/$target/$d/ | 39 | mkdir -p ${B}/${TARGET_SYS}/$d/ |
41 | cd ${B}/$target/$d/ | 40 | cd ${B}/${TARGET_SYS}/$d/ |
42 | chmod a+x ${S}/$d/configure | 41 | chmod a+x ${S}/$d/configure |
43 | relpath=${@os.path.relpath("${S}/$d", "${B}/$target/$d")} | 42 | relpath=${@os.path.relpath("${S}/$d", "${B}/${TARGET_SYS}/$d")} |
44 | $relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} | 43 | $relpath/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} |
45 | done | 44 | done |
46 | } | 45 | } |
@@ -48,18 +47,16 @@ EXTRACONFFUNCS += "extract_stashed_builddir" | |||
48 | do_configure[depends] += "${COMPILERDEP}" | 47 | do_configure[depends] += "${COMPILERDEP}" |
49 | 48 | ||
50 | do_compile () { | 49 | do_compile () { |
51 | target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` | ||
52 | for d in libgcc ${RUNTIMETARGET}; do | 50 | for d in libgcc ${RUNTIMETARGET}; do |
53 | cd ${B}/$target/$d/ | 51 | cd ${B}/${TARGET_SYS}/$d/ |
54 | oe_runmake MULTIBUILDTOP=${B}/$target/$d/ | 52 | oe_runmake MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/ |
55 | done | 53 | done |
56 | } | 54 | } |
57 | 55 | ||
58 | do_install () { | 56 | do_install () { |
59 | target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` | ||
60 | for d in ${RUNTIMETARGET}; do | 57 | for d in ${RUNTIMETARGET}; do |
61 | cd ${B}/$target/$d/ | 58 | cd ${B}/${TARGET_SYS}/$d/ |
62 | oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install | 59 | oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/${TARGET_SYS}/$d/ install |
63 | done | 60 | done |
64 | rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir | 61 | rm -rf ${D}${infodir}/libgomp.info ${D}${infodir}/dir |
65 | rm -rf ${D}${infodir}/libitm.info ${D}${infodir}/dir | 62 | rm -rf ${D}${infodir}/libitm.info ${D}${infodir}/dir |