diff options
| author | Hyeongseok Oh <hseok82.oh@samsung.com> | 2016-12-17 04:06:16 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-12-16 20:06:16 +0100 |
| commit | bedc2a0f2031538ac236ff129572739d1ecd97bb (patch) | |
| tree | bf220c72e3ff4b866745b37d13c688da0e1fb2c6 /src/pal/tools | |
| parent | aeae8e110c4f93602f00a18ac1cdb3cb9d2700a9 (diff) | |
| download | coreclr-bedc2a0f2031538ac236ff129572739d1ecd97bb.tar.gz coreclr-bedc2a0f2031538ac236ff129572739d1ecd97bb.tar.bz2 coreclr-bedc2a0f2031538ac236ff129572739d1ecd97bb.zip | |
Fix buildsystem for linux cross-architecture component build (#8646)
* Fix buildsystem for linux cross-architecture component build
* refactoring build.sh, bug fix and typo fix
* Update build.sh
Diffstat (limited to 'src/pal/tools')
| -rwxr-xr-x | src/pal/tools/gen-buildsys-clang.sh | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index 022a9ccf56..4054266f0b 100755 --- a/src/pal/tools/gen-buildsys-clang.sh +++ b/src/pal/tools/gen-buildsys-clang.sh @@ -126,16 +126,20 @@ fi if [[ -n "$LLDB_INCLUDE_DIR" ]]; then cmake_extra_defines="$cmake_extra_defines -DWITH_LLDB_INCLUDES=$LLDB_INCLUDE_DIR" fi -if [[ -n "$CROSSCOMPILE" ]]; then - if ! [[ -n "$ROOTFS_DIR" ]]; then - echo "ROOTFS_DIR not set for crosscompile" - exit 1 - fi - if [[ -z $CONFIG_DIR ]]; then - CONFIG_DIR="$1/cross/$build_arch" +if [[ -n "$CROSSCOMPONENT" ]]; then + cmake_extra_defines="$cmake_extra_defines -DCLR_CROSS_COMPONENTS_BUILD=1" +else + if [[ -n "$CROSSCOMPILE" ]]; then + if ! [[ -n "$ROOTFS_DIR" ]]; then + echo "ROOTFS_DIR not set for crosscompile" + exit 1 + fi + if [[ -z $CONFIG_DIR ]]; then + CONFIG_DIR="$1/cross/$build_arch" + fi + cmake_extra_defines="$cmake_extra_defines -C $CONFIG_DIR/tryrun.cmake" + cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$CONFIG_DIR/toolchain.cmake" fi - cmake_extra_defines="$cmake_extra_defines -C $CONFIG_DIR/tryrun.cmake" - cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$CONFIG_DIR/toolchain.cmake" fi if [ "$build_arch" == "arm-softfp" ]; then cmake_extra_defines="$cmake_extra_defines -DARM_SOFTFP=1" |