Remove Clang specific settings from toolchain.cmake

Move clang specific settings from toolchain.cmake to src\pal\tools\gen-buildsys-clang.sh

Author: franksinankaya

cross/toolchain.cmake

@@ -4,6 +4,7 @@ set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH})
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 
+# please update toolchain.sh if you add a new target here.
 if(TARGET_ARCH_NAME STREQUAL "armel")
   set(CMAKE_SYSTEM_PROCESSOR armv7l)
   set(TOOLCHAIN "arm-linux-gnueabi")
@@ -62,11 +63,6 @@ endmacro()
 
 # Specify link flags
 add_compile_param(CROSS_LINK_FLAGS "--sysroot=${CROSS_ROOTFS}")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  add_compile_param(CROSS_LINK_FLAGS "--gcc-toolchain=${CROSS_ROOTFS}/usr")
-  add_compile_param(CROSS_LINK_FLAGS "--target=${TOOLCHAIN}")
-endif()
-
 add_compile_param(CROSS_LINK_FLAGS "-fuse-ld=gold")
 
 if(TARGET_ARCH_NAME STREQUAL "armel")
@@ -86,10 +82,6 @@ add_compile_param(CMAKE_MODULE_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE
 
 # Specify compile options
 add_compile_options("--sysroot=${CROSS_ROOTFS}")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  add_compile_options("--target=${TOOLCHAIN}")
-  add_compile_options("--gcc-toolchain=${CROSS_ROOTFS}/usr")
-endif()
 
 if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
   set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN})

cross/toolchain.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env sh
+TARGET_ARCH_NAME=$TARGET_BUILD_ARCH
+
+if [ ! -z $TOOLCHAIN ]; then
+  return 0
+fi
+
+if [ "$TARGET_ARCH_NAME" = "armel" ]; then
+  export TOOLCHAIN="arm-linux-gnueabi"
+elif [ "$TARGET_ARCH_NAME" = "arm" ]; then
+  if [ -d ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf ]; then
+    export TOOLCHAIN="armv6-alpine-linux-musleabihf"
+  else
+    export TOOLCHAIN="arm-linux-gnueabihf"
+  fi
+elif [ "$TARGET_ARCH_NAME" = "arm64" ]; then
+  if [ -d ${CROSS_ROOTFS}/usr/lib/gcc/aarch64-alpine-linux-musl ]; then
+    export TOOLCHAIN="aarch64-alpine-linux-musl"
+  else
+    export TOOLCHAIN="aarch64-linux-gnu"
+  fi
+elif [ "$TARGET_ARCH_NAME" = "x86" ]; then
+  export TOOLCHAIN="i686-linux-gnu"
+else
+  echo "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64 and x86 are supported!"]
+  return 1
+fi
+
+return 0

src/pal/tools/gen-buildsys-clang.sh

@@ -112,6 +112,10 @@ fi
 if [[ -n "$LLDB_INCLUDE_DIR" ]]; then
     cmake_extra_defines="$cmake_extra_defines -DWITH_LLDB_INCLUDES=$LLDB_INCLUDE_DIR"
 fi
+
+CLR_EXTRA_LLVM_COMPILE_FLAGS=""
+CLR_EXTRA_LLVM_LD_FLAGS=""
+
 if [ "$CROSSCOMPILE" == "1" ]; then
     if ! [[ -n "$ROOTFS_DIR" ]]; then
         echo "ROOTFS_DIR not set for crosscompile"
@@ -124,7 +128,17 @@ if [ "$CROSSCOMPILE" == "1" ]; then
     cmake_extra_defines="$cmake_extra_defines -C $CONFIG_DIR/tryrun.cmake"
     cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$CONFIG_DIR/toolchain.cmake"
     cmake_extra_defines="$cmake_extra_defines -DCLR_UNIX_CROSS_BUILD=1"
+    CLR_EXTRA_LLVM_COMPILE_FLAGS="$CLR_EXTRA_LLVM_COMPILE_FLAGS --gcc-toolchain=$ROOTFS_DIR/usr"
+    CLR_EXTRA_LLVM_LD_FLAGS="$CLR_EXTRA_LLVM_LD_FLAGS --gcc-toolchain=$ROOTFS_DIR/usr"
+    source $CONFIG_DIR/toolchain.sh
+    CLR_EXTRA_LLVM_COMPILE_FLAGS="$CLR_EXTRA_LLVM_COMPILE_FLAGS --target=$TOOLCHAIN"
+    CLR_EXTRA_LLVM_LD_FLAGS="$CLR_EXTRA_LLVM_LD_FLAGS --target=$TOOLCHAIN"
 fi
+
+CMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS $CLR_EXTRA_LLVM_COMPILE_FLAGS"
+CMAKE_C_FLAGS="$CMAKE_C_FLAGS $CLR_EXTRA_LLVM_COMPILE_FLAGS"
+CMAKE_LD_FLAGS="$CMAKE_LD_FLAGS $CLR_EXTRA_LLVM_LD_FLAGS"
+
 if [ $OS == "Linux" ]; then
     linux_id_file="/etc/os-release"
     if [[ -n "$CROSSCOMPILE" ]]; then
@@ -162,6 +176,9 @@ cmake \
   "-DCMAKE_BUILD_TYPE=$buildtype" \
   "-DCMAKE_EXPORT_COMPILE_COMMANDS=1 " \
   "-DCLR_CMAKE_ENABLE_CODE_COVERAGE=$code_coverage" \
+  "-DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS" \
+  "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS" \
+  "-DCMAKE_LD_FLAGS=$CMAKE_LD_FLAGS" \
   $cmake_extra_defines \
   $__UnprocessedCMakeArgs \
   "$1"