Cleanup

Signed-off-by: falkTX <[email protected]>
DISTRHO · Dec 30, 2023 · 55536d6 · 55536d6
1 parent ba8f1a5
commit 55536d6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
@@ -529,17 +529,19 @@ jobs:
             os: macos-11
           - target: macos-universal
             os: macos-11
-          - target: macos-universal-10.15
-            os: macos-11
+          # FIXME broken build
+          #- target: macos-universal-10.15
+            #os: macos-11
           # macos 12
           - target: macos
             os: macos-12
           - target: macos-10.15
             os: macos-12
           - target: macos-universal
             os: macos-12
-          - target: macos-universal-10.15
-            os: macos-12
+          # FIXME broken build
+          #- target: macos-universal-10.15
+            #os: macos-12
           # debian:11
           - target: linux-aarch64
             container: debian:11
@@ -799,19 +801,23 @@ jobs:
           ./bootstrap-carla.sh ${{ matrix.target }} && ./.cleanup.sh ${{ matrix.target }}
 
   modaudio:
+    env:
+      PAWPAW_SKIP_LTO: 1
     strategy:
       matrix:
         include:
           # macos 11
           - target: macos-10.15
             os: macos-11
-          - target: macos-universal-10.15
-            os: macos-11
+          # FIXME broken build
+          #- target: macos-universal-10.15
+            #os: macos-11
           # macos 12
           - target: macos-10.15
             os: macos-12
-          - target: macos-universal-10.15
-            os: macos-12
+          # FIXME broken build
+          #- target: macos-universal-10.15
+            #os: macos-12
           # debian 11
           - target: linux-x86_64
             container: debian:11

diff --git a/bootstrap-python.sh b/bootstrap-python.sh
@@ -80,6 +80,8 @@ function build_conf_openssl() {
         fi
         export RELEASE="whatever"
         export BUILD="unknown"
+    elif [ "${MACOS_UNIVERSAL}" -eq 0 ] && [ "$(uname -m)" != "x86_64" ]; then
+        export MACHINE="x86_64"
     fi
 
     _prebuild "${name}" "${pkgdir}"

diff --git a/setup/check_target.sh b/setup/check_target.sh
@@ -31,15 +31,15 @@ function check_target() {
             CLANG=1
             MACOS=1
             ;;
-        "macos-universal")
+        "macos-10.15")
             CLANG=1
             MACOS=1
-            MACOS_UNIVERSAL=1
+            MACOS_10_15=1
             ;;
-        "macos-10.15")
+        "macos-universal")
             CLANG=1
             MACOS=1
-            MACOS_10_15=1
+            MACOS_UNIVERSAL=1
             ;;
         "macos-universal-10.15")
             CLANG=1
@@ -167,8 +167,16 @@ function check_target() {
             ;;
         default|*)
             echo "Invalid target '${target}', possible values are:"
-            echo "\tmacos"
+            echo "\tlinux"
+            echo "\tlinux-aarch64|linux-arm64"
+            echo "\tlinux-armhf"
+            echo "\tlinux-i686|linux-i386"
+            echo "\tlinux-riscv64"
+            echo "\tlinux-x86_64"
+            echo "\tmacos|macos-intel"
+            echo "\tmacos-10.15"
             echo "\tmacos-universal"
+            echo "\tmacos-universal-10.15"
             echo "\twasm"
             echo "\twin32"
             echo "\twin64"