Add more cross-compilation options

lloeki · lloeki · commit fb3367836528 · 2022-08-26T21:04:13.000+02:00
- arm64-darwin from x86_64-darwin (also added to CI)
- x86_64-darwin from arm64-darwin
- x86_64-linux from aarch64-linux
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -73,11 +73,14 @@ jobs:
       matrix:
         platform:
           - x86_64
-          # arm64
+          - arm64
     name: Build (darwin)
     outputs:
       GEM_VERSION: ${{ steps.set-metadata.outputs.GEM_VERSION }}
     runs-on: macos-12
+    env:
+      TARGET_PLATFORM: ${{ matrix.platform }}-darwin
+      RUBY_TARGET_PLATFORM: ${{ matrix.platform }}-darwin
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/libexec/build-libv8 b/libexec/build-libv8
@@ -29,8 +29,8 @@ eval "$("${libexec}/platform")"
 echo "configure: ${configure_flags}"
 echo "compilers: CC='${CC}' CXX='${CXX}' CC_host='${CC_host:-}' CXX_host='${CXX_host:-}'"
 
-"${CC}" -v
-"${CXX}" -v
+${CC} -v
+${CXX} -v
 
 # shellcheck disable=SC2086
 "${PYTHON}" configure ${configure_flags}
diff --git a/libexec/platform b/libexec/platform
@@ -16,7 +16,7 @@ fi
 
 STRIP="${STRIP:-strip}"
 
-triple=$("${CC}" -dumpmachine)
+triple=$(${CC} -dumpmachine)
 host_platform="${triple}"
 target_platform="${TARGET_PLATFORM:-${1:-}}"
 target_platform="${target_platform:-${host_platform}}"
@@ -42,14 +42,17 @@ case "${target_platform}" in
         ;;
     x86_64*-darwin*)
         # not for cross compilation
-        RUBY_TARGET_PLATFORM="$(ruby -e 'puts Gem::Platform.local.to_s.gsub(/-darwin-?\d+/, "-darwin")')"
+        RUBY_TARGET_PLATFORM='x86_64-darwin'
         ;;
     arm64*-darwin*)
         # not for cross compilation
-        RUBY_TARGET_PLATFORM="$(ruby -e 'puts Gem::Platform.local.to_s.gsub(/-darwin-?\d+/, "-darwin")')"
+        RUBY_TARGET_PLATFORM='arm64-darwin'
         ;;
     *)
-        # not for cross compilation
+        if [ "${host_platform}" != "${target_platform}" ]; then
+            echo 'cross compilation not supported'
+            exit 1
+        fi
         RUBY_TARGET_PLATFORM="$(ruby -e 'puts Gem::Platform.local.to_s')"
         ;;
 esac
@@ -81,6 +84,30 @@ if [ "${host_platform}" != "${target_platform}" ]; then
             STRIP='arm-linux-gnueabihf-strip'
             configure_flags='--dest-cpu=arm --cross-compiling --dest-os=linux --with-arm-float-abi=hard --with-arm-fpu=neon'
             ;;
+        x86_64-*linux*)
+            CC='x86_64-linux-gnu-gcc'
+            CXX='x86_64-linux-gnu-g++'
+            CC_host='gcc'
+            CXX_host='g++'
+            STRIP='x86_64-linux-gnu-strip'
+            configure_flags='--dest-cpu=x86_64 --cross-compiling --dest-os=linux'
+            ;;
+        x86_64*-darwin*)
+            CC='clang -arch x86_64'
+            CXX='clang++ -arch x86_64'
+            CC_host='clang'
+            CXX_host='clang++'
+            STRIP='strip'
+            configure_flags='--dest-cpu=x86_64 --cross-compiling --dest-os=mac'
+            ;;
+        arm64*-darwin*)
+            CC='clang -arch arm64'
+            CXX='clang++ -arch arm64'
+            CC_host='clang'
+            CXX_host='clang++'
+            STRIP='strip'
+            configure_flags='--dest-cpu=arm64 --cross-compiling --dest-os=mac'
+            ;;
         *)
             configure_flags=''
             ;;
