[oe-commits] Koen Kooi : scons bbclass: add SCONS_FIX_ENV option that allows you to fix the toolchain from env

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 01d75b1a857f53f22304266e3d88c11993851563
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=01d75b1a857f53f22304266e3d88c11993851563

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue Mar 30 13:04:33 2010 +0200

scons bbclass: add SCONS_FIX_ENV option that allows you to fix the toolchain from env

---

 classes/scons.bbclass |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/classes/scons.bbclass b/classes/scons.bbclass
index b7007b0..2a935e4 100644
--- a/classes/scons.bbclass
+++ b/classes/scons.bbclass
@@ -1,8 +1,18 @@
 DEPENDS += "python-scons-native"
 
+export TARGET_LINK_HASH_STYLE
+
 scons_do_compile() {
-        ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} || \
-        oefatal "scons build execution failed."
+    if [ "${SCONS_FIX_ENV}" = "1" ] ; then
+        if grep "toolchain-from-env" ${S}/SConstruct ; then
+            echo "Toolchain overrides already applied"
+        else
+           cat ${STAGING_DATADIR_NATIVE}/scons/toolchain-from-env.SConscript >> ${S}/SConstruct
+        fi
+    fi
+
+    ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} CXX="${CXX}" PREFIX=${prefix} prefix=${prefix} || \
+    oefatal "scons build execution failed."
 }
 
 scons_do_install() {