diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-22 09:12:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-23 16:20:12 +0100 |
commit | 50170617c632e62aa68e9bbb700fd8290fa4b90e (patch) | |
tree | 9d8456a926566080693eda3ffec4a8c64b8c8238 /meta/recipes-devtools/gcc/gcc-configure-runtime.inc | |
parent | b64d6af3ec80d2f4040378c785ffcac415c0827a (diff) | |
download | poky-50170617c632e62aa68e9bbb700fd8290fa4b90e.tar.gz |
bitbake.conf/classes/gcc: Don't hardcode -nativesdk
Hardcoding -nativesdk as the sdk package architecture is inflexible. We may have
multiple different target OS and we need a way to be able to separate them. Turning
this into a configurable value allows the flexibility we need to build different
SDKMACHINEs with different OS targets.
The commit should have no behaviour change, just makes things more configurable.
(From OE-Core rev: a2110e86b98d646e136de9ec6b8e668079b0d4f4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-configure-runtime.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-configure-runtime.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc index 977a98a377..f89ca6bbad 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc | |||
@@ -15,8 +15,8 @@ RUNTIMETARGET = "libssp libstdc++-v3 libgomp" | |||
15 | 15 | ||
16 | do_configure () { | 16 | do_configure () { |
17 | export CXX="${CXX} -nostdinc++ -nostdlib++" | 17 | export CXX="${CXX} -nostdinc++ -nostdlib++" |
18 | mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-nativesdk##` | 18 | mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` |
19 | target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` | 19 | target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` |
20 | cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget/* ${B} | 20 | cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget/* ${B} |
21 | for d in libgcc ${RUNTIMETARGET}; do | 21 | for d in libgcc ${RUNTIMETARGET}; do |
22 | echo "Configuring $d" | 22 | echo "Configuring $d" |
@@ -29,7 +29,7 @@ do_configure () { | |||
29 | } | 29 | } |
30 | 30 | ||
31 | do_compile () { | 31 | do_compile () { |
32 | target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` | 32 | target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` |
33 | for d in libgcc ${RUNTIMETARGET}; do | 33 | for d in libgcc ${RUNTIMETARGET}; do |
34 | cd ${B}/$target/$d/ | 34 | cd ${B}/$target/$d/ |
35 | oe_runmake MULTIBUILDTOP=${B}/$target/$d/ | 35 | oe_runmake MULTIBUILDTOP=${B}/$target/$d/ |
@@ -37,7 +37,7 @@ do_compile () { | |||
37 | } | 37 | } |
38 | 38 | ||
39 | do_install () { | 39 | do_install () { |
40 | target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##` | 40 | target=`echo ${TARGET_SYS} | sed -e s#-${SDKPKGSUFFIX}##` |
41 | for d in ${RUNTIMETARGET}; do | 41 | for d in ${RUNTIMETARGET}; do |
42 | cd ${B}/$target/$d/ | 42 | cd ${B}/$target/$d/ |
43 | oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install | 43 | oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install |