diff options
-rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 0ff5301530..63b07c802f 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass | |||
@@ -51,6 +51,7 @@ toolchain_create_sdk_env_script () { | |||
51 | echo "export OECORE_NATIVE_SYSROOT=\"$sdkpathnative\"" >> $script | 51 | echo "export OECORE_NATIVE_SYSROOT=\"$sdkpathnative\"" >> $script |
52 | echo 'export OECORE_TARGET_SYSROOT="$SDKTARGETSYSROOT"' >> $script | 52 | echo 'export OECORE_TARGET_SYSROOT="$SDKTARGETSYSROOT"' >> $script |
53 | echo "export OECORE_ACLOCAL_OPTS=\"-I $sdkpathnative/usr/share/aclocal\"" >> $script | 53 | echo "export OECORE_ACLOCAL_OPTS=\"-I $sdkpathnative/usr/share/aclocal\"" >> $script |
54 | echo 'export OECORE_BASELIB="${baselib}"' >> $script | ||
54 | echo 'unset command_not_found_handle' >> $script | 55 | echo 'unset command_not_found_handle' >> $script |
55 | 56 | ||
56 | toolchain_shared_env_script | 57 | toolchain_shared_env_script |
diff --git a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake index dc8477ea34..d52c29e5a1 100644 --- a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake +++ b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake | |||
@@ -10,6 +10,8 @@ set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) | |||
10 | set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) | 10 | set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) |
11 | set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) | 11 | set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) |
12 | 12 | ||
13 | set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX "$ENV{OE_CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX}") | ||
14 | |||
13 | # Set CMAKE_SYSTEM_PROCESSOR from the sysroot name (assuming processor-distro-os). | 15 | # Set CMAKE_SYSTEM_PROCESSOR from the sysroot name (assuming processor-distro-os). |
14 | if ($ENV{SDKTARGETSYSROOT} MATCHES "/sysroots/([a-zA-Z0-9_-]+)-.+-.+") | 16 | if ($ENV{SDKTARGETSYSROOT} MATCHES "/sysroots/([a-zA-Z0-9_-]+)-.+-.+") |
15 | set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_MATCH_1}) | 17 | set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_MATCH_1}) |
diff --git a/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh b/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh index 64b6cf3c6a..7bdb19fb6c 100644 --- a/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh +++ b/meta/recipes-devtools/cmake/cmake/environment.d-cmake.sh | |||
@@ -1 +1,2 @@ | |||
1 | export OE_CMAKE_TOOLCHAIN_FILE="$OECORE_NATIVE_SYSROOT/usr/share/cmake/OEToolchainConfig.cmake" | 1 | export OE_CMAKE_TOOLCHAIN_FILE="$OECORE_NATIVE_SYSROOT/usr/share/cmake/OEToolchainConfig.cmake" |
2 | export OE_CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX="`echo $OECORE_BASELIB | sed -e s/lib//`" | ||