Unify OSX and Linux paths related to cross-compiling in vcpkg portfile

Author: carlopi

.github/workflows/MainDistributionPipeline.yml

@@ -18,21 +18,12 @@ jobs:
     with:
       extension_name: mysql_scanner
       duckdb_version: 'v0.10.2'
-      exclude_archs: 'osx_amd64;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
+      exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools'
       build_duckdb_shell: false
 
-  # Note: this workaround is required for building MacOS where extra toolchain config is required
-  duckdb-stable-build-macos:
-    name: Build extension binaries
-    uses: ./.github/workflows/_extension_distribution_macos.yml
-    with:
-      duckdb_version: v0.10.2
-      extension_name: mysql_scanner
-
-
   duckdb-stable-deploy:
     name: Deploy extension binaries
-    needs: [duckdb-stable-build, duckdb-stable-build-macos]
+    needs: duckdb-stable-build
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:

.github/workflows/MysqlTests.yml

@@ -54,7 +54,7 @@ jobs:
 
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.7'
+          python-version: '3.11'
 
       - name: Setup vcpkg
         uses: lukka/[email protected]
@@ -70,9 +70,6 @@ jobs:
       - name: Build extension
         shell: bash
         run: |
-          # needed for MySQL cross compilation - see https://mariadb.com/kb/en/cross-compiling-mariadb/
-          echo 'SET(STACK_DIRECTION -1)' >> ${VCPKG_TOOLCHAIN_PATH}
-          echo 'SET(HAVE_IB_GCC_ATOMIC_BUILTINS 0)' >> ${VCPKG_TOOLCHAIN_PATH}
           make release
 
       - name: Test Extension

.github/workflows/_extension_distribution_macos.yml

@@ -22,22 +22,18 @@ endif()
 
 set(CROSS_COMPILING "")
 set(STACK_DIRECTION "")
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+if(NOT VCPKG_TARGET_IS_WINDOWS)
     set(STACK_DIRECTION -DSTACK_DIRECTION=-1)
-else()
-    # ARM builds are always cross compiled
+    set(HAVE_IB_GCC_ATOMIC_BUILTINS 0)
+    set(CROSS_COMPILING -DCMAKE_CROSSCOMPILING=1)
+    # Non-Windows builds are always cross-compiled
     # as such we build the executables (comp_sql, uca9dump, comp_client_err) separately
     set(PATCH_FILES
         ${PATCH_FILES}
         remove_executables.patch
     )
-    if(VCPKG_TARGET_IS_LINUX)
-        set(CROSS_COMPILING -DCMAKE_CROSSCOMPILING=1)
-        set(STACK_DIRECTION -DSTACK_DIRECTION=-1)
-    endif()
 endif()
 
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mysql/mysql-server