diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index b2165bc275..fb59761fd6 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass | |||
@@ -14,7 +14,7 @@ toolchain_create_sdk_env_script () { | |||
14 | echo 'export CXX=${TARGET_PREFIX}g++' >> $script | 14 | echo 'export CXX=${TARGET_PREFIX}g++' >> $script |
15 | echo 'export GDB=${TARGET_PREFIX}gdb' >> $script | 15 | echo 'export GDB=${TARGET_PREFIX}gdb' >> $script |
16 | echo 'export TARGET_PREFIX=${TARGET_PREFIX}' >> $script | 16 | echo 'export TARGET_PREFIX=${TARGET_PREFIX}' >> $script |
17 | echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux"' >> $script | 17 | echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux --with-libtool-sysroot=${SDKTARGETSYSROOT}"' >> $script |
18 | if [ "${TARGET_OS}" = "darwin8" ]; then | 18 | if [ "${TARGET_OS}" = "darwin8" ]; then |
19 | echo 'export TARGET_CFLAGS="-I${SDKTARGETSYSROOT}${includedir}"' >> $script | 19 | echo 'export TARGET_CFLAGS="-I${SDKTARGETSYSROOT}${includedir}"' >> $script |
20 | echo 'export TARGET_LDFLAGS="-L${SDKTARGETSYSROOT}${libdir}"' >> $script | 20 | echo 'export TARGET_LDFLAGS="-L${SDKTARGETSYSROOT}${libdir}"' >> $script |
@@ -22,10 +22,8 @@ toolchain_create_sdk_env_script () { | |||
22 | cd ${SDK_OUTPUT}${SDKTARGETSYSROOT}/usr | 22 | cd ${SDK_OUTPUT}${SDKTARGETSYSROOT}/usr |
23 | ln -s /usr/local local | 23 | ln -s /usr/local local |
24 | fi | 24 | fi |
25 | echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script | 25 | echo 'export CFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script |
26 | echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script | 26 | echo 'export CXXFLAGS="${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}"' >> $script |
27 | echo "alias opkg='LD_LIBRARY_PATH=${SDKPATHNATIVE}${libdir_nativesdk} ${SDKPATHNATIVE}${bindir_nativesdk}/opkg-cl -f ${SDKPATHNATIVE}/${sysconfdir}/opkg-sdk.conf -o ${SDKPATHNATIVE}'" >> $script | ||
28 | echo "alias opkg-target='LD_LIBRARY_PATH=${SDKPATHNATIVE}${libdir_nativesdk} ${SDKPATHNATIVE}${bindir_nativesdk}/opkg-cl -f ${SDKTARGETSYSROOT}${sysconfdir}/opkg.conf -o ${SDKTARGETSYSROOT}'" >> $script | ||
29 | echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script | 27 | echo 'export POKY_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script |
30 | echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script | 28 | echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script |
31 | echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script | 29 | echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script |
@@ -75,7 +73,7 @@ toolchain_create_sdk_env_script_for_installer () { | |||
75 | echo 'export CXX=${TARGET_PREFIX}g++' >> $script | 73 | echo 'export CXX=${TARGET_PREFIX}g++' >> $script |
76 | echo 'export GDB=${TARGET_PREFIX}gdb' >> $script | 74 | echo 'export GDB=${TARGET_PREFIX}gdb' >> $script |
77 | echo 'export TARGET_PREFIX=${TARGET_PREFIX}' >> $script | 75 | echo 'export TARGET_PREFIX=${TARGET_PREFIX}' >> $script |
78 | echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux"' >> $script | 76 | echo 'export CONFIGURE_FLAGS="--target=${TARGET_SYS} --host=${TARGET_SYS} --build=${SDK_ARCH}-linux --with-libtool-sysroot=##SDKTARGETSYSROOT##"' >> $script |
79 | if [ "${TARGET_OS}" = "darwin8" ]; then | 77 | if [ "${TARGET_OS}" = "darwin8" ]; then |
80 | echo 'export TARGET_CFLAGS="-I##SDKTARGETSYSROOT##${target_includedir}"' >> $script | 78 | echo 'export TARGET_CFLAGS="-I##SDKTARGETSYSROOT##${target_includedir}"' >> $script |
81 | echo 'export TARGET_LDFLAGS="-L##SDKTARGETSYSROOT##{target_libdir}"' >> $script | 79 | echo 'export TARGET_LDFLAGS="-L##SDKTARGETSYSROOT##{target_libdir}"' >> $script |