diff options
| author | Hyeongseok Oh <hseok82.oh@samsung.com> | 2017-01-05 21:32:44 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-01-05 13:32:44 +0100 |
| commit | f66ba4a14a5e729778d66ea6cc1409f0e8b4a5b0 (patch) | |
| tree | 7638ab1b25388eefbb122f9f1c330401ca5c9846 /src/pal/tools | |
| parent | 165fa5cebf0b937f74855584ca5b658e7e83c41b (diff) | |
| download | coreclr-f66ba4a14a5e729778d66ea6cc1409f0e8b4a5b0.tar.gz coreclr-f66ba4a14a5e729778d66ea6cc1409f0e8b4a5b0.tar.bz2 coreclr-f66ba4a14a5e729778d66ea6cc1409f0e8b4a5b0.zip | |
Use x86 crossbuild for cross-architecture component on x64-linux (#8722)
* Use x86 crossbuild for cross-architecture component on x64-linux
Fix build.sh and build system generator to use x86 cross-build system on x64-linux
- x86-host/ARM32-target cross-architecture component build on x64 linux
- use x86 root file system and cross buildtool
* Modify build.sh
- define new function: build_cross_arch_component
- fix typo
* Additional fix: build.sh
add usage description
- environment variable: CAC_ROOTFS_DIR
- argument: crosscomponent
Diffstat (limited to 'src/pal/tools')
| -rwxr-xr-x | src/pal/tools/gen-buildsys-clang.sh | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index a25e5a0645..3386c5d64c 100755 --- a/src/pal/tools/gen-buildsys-clang.sh +++ b/src/pal/tools/gen-buildsys-clang.sh @@ -128,18 +128,17 @@ if [[ -n "$LLDB_INCLUDE_DIR" ]]; then fi 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 +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 if [ "$build_arch" == "armel" ]; then cmake_extra_defines="$cmake_extra_defines -DARM_SOFTFP=1" |