diff options
Diffstat (limited to 'meta/classes/toolchain-scripts.bbclass')
-rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 1d7c703748..16f1e17607 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass | |||
@@ -63,24 +63,46 @@ toolchain_create_sdk_env_script () { | |||
63 | toolchain_shared_env_script | 63 | toolchain_shared_env_script |
64 | } | 64 | } |
65 | 65 | ||
66 | # This function creates an environment-setup-script in the TMPDIR which enables | 66 | # This function creates an environment-setup-script in B which enables |
67 | # a OE-core IDE to integrate with the build tree | 67 | # a OE-core IDE to integrate with the build tree |
68 | # Caller must ensure CONFIG_SITE is setup | 68 | # Caller must ensure CONFIG_SITE is setup |
69 | toolchain_create_tree_env_script () { | 69 | toolchain_create_tree_env_script () { |
70 | script=${TMPDIR}/environment-setup-${REAL_MULTIMACH_TARGET_SYS} | 70 | script=${B}/environment-setup-${REAL_MULTIMACH_TARGET_SYS} |
71 | rm -f $script | 71 | rm -f $script |
72 | touch $script | 72 | touch $script |
73 | echo 'standalone_sysroot_target="${STAGING_DIR}/${MACHINE}"' >> $script | ||
74 | echo 'standalone_sysroot_native="${STAGING_DIR}/${BUILD_ARCH}"' >> $script | ||
73 | echo 'orig=`pwd`; cd ${COREBASE}; . ./oe-init-build-env ${TOPDIR}; cd $orig' >> $script | 75 | echo 'orig=`pwd`; cd ${COREBASE}; . ./oe-init-build-env ${TOPDIR}; cd $orig' >> $script |
74 | echo 'export PATH=${STAGING_DIR_NATIVE}/usr/bin:${STAGING_BINDIR_TOOLCHAIN}:$PATH' >> $script | 76 | echo 'export PATH=$standalone_sysroot_native/${bindir_native}:$standalone_sysroot_native/${bindir_native}/${TARGET_SYS}:$PATH' >> $script |
75 | echo 'export PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR}' >> $script | 77 | echo 'export PKG_CONFIG_SYSROOT_DIR=$standalone_sysroot_target' >> $script |
76 | echo 'export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}' >> $script | 78 | echo 'export PKG_CONFIG_PATH=$standalone_sysroot_target'"$libdir"'/pkgconfig:$standalone_sysroot_target'"$prefix"'/share/pkgconfig' >> $script |
77 | echo 'export CONFIG_SITE="${CONFIG_SITE}"' >> $script | 79 | echo 'export CONFIG_SITE="${CONFIG_SITE}"' >> $script |
78 | echo 'export SDKTARGETSYSROOT=${STAGING_DIR_TARGET}' >> $script | 80 | echo 'export SDKTARGETSYSROOT=$standalone_sysroot_target' >> $script |
79 | echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script | 81 | echo 'export OECORE_NATIVE_SYSROOT=$standalone_sysroot_native' >> $script |
80 | echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script | 82 | echo 'export OECORE_TARGET_SYSROOT=$standalone_sysroot_target' >> $script |
81 | echo 'export OECORE_ACLOCAL_OPTS="-I ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script | 83 | echo 'export OECORE_ACLOCAL_OPTS="-I $standalone_sysroot_native/usr/share/aclocal"' >> $script |
84 | echo 'export OECORE_BASELIB="${baselib}"' >> $script | ||
85 | echo 'export OECORE_TARGET_ARCH="${TARGET_ARCH}"' >>$script | ||
86 | echo 'export OECORE_TARGET_OS="${TARGET_OS}"' >>$script | ||
82 | 87 | ||
83 | toolchain_shared_env_script | 88 | toolchain_shared_env_script |
89 | |||
90 | cat >> $script <<EOF | ||
91 | |||
92 | if [ -d "\$OECORE_NATIVE_SYSROOT/${datadir}/post-relocate-setup.d/" ]; then | ||
93 | for s in \$OECORE_NATIVE_SYSROOT/${datadir}/post-relocate-setup.d/*; do | ||
94 | if [ ! -x \$s ]; then | ||
95 | continue | ||
96 | fi | ||
97 | \$s "\$1" | ||
98 | status=\$? | ||
99 | if [ \$status != 0 ]; then | ||
100 | echo "post-relocate command \"\$s \$1\" failed with status \$status" >&2 | ||
101 | exit \$status | ||
102 | fi | ||
103 | done | ||
104 | fi | ||
105 | EOF | ||
84 | } | 106 | } |
85 | 107 | ||
86 | toolchain_shared_env_script () { | 108 | toolchain_shared_env_script () { |