LIB_PARAMS is actually needed. Is libunistring actually needed to?

Apprentice-Alchemist · Dec 22, 2023 · 8ecff5c · 8ecff5c
1 parent e8ee252
commit 8ecff5c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -589,13 +589,6 @@ jobs:
         with:
           submodules: recursive
 
-      # - name: Cache opam
-      #   id: cache-opam
-      #   uses: actions/cache@v3.0.11
-      #   with:
-      #     path: ~/.opam/
-      #     key: ${{ runner.os }}-${{ hashFiles('./haxe.opam', './libs/') }}
-
       - name: Install Neko from S3
         run: |
           set -ex
@@ -621,7 +614,8 @@ jobs:
 
       - name: Install dependencies
         env:
-          # For compatibility with macOS 10.13
+          # These libraries are compiled from source and the statically linked
+          # This ensures maximum portability of the resulting compiler binary
           ZLIB_VERSION: 1.3
           MBEDTLS_VERSION: 2.28.5
           PCRE2_VERSION: 10.42
@@ -656,7 +650,9 @@ jobs:
       - name: Build Haxe
         run: |
           set -ex
-          opam exec -- make -s STATICLINK=1 haxe
+          export STATICLINK=1
+          export "LIB_PARAMS=/usr/local/lib/libz.a /usr/local/lib/libpcre2-8.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-framework Security -framework CoreFoundation'"
+          opam exec -- make -s haxe
           opam exec -- make -s haxelib
           make -s package_unix package_installer_mac
           otool -L ./haxe

diff --git a/extra/github-actions/build-mac.yml b/extra/github-actions/build-mac.yml
@@ -6,7 +6,8 @@
 
 - name: Install dependencies
   env:
-    # For compatibility with macOS 10.13
+    # These libraries are compiled from source and the statically linked
+    # This ensures maximum portability of the resulting compiler binary
     ZLIB_VERSION: 1.3
     MBEDTLS_VERSION: 2.28.5
     PCRE2_VERSION: 10.42
@@ -41,7 +42,9 @@
 - name: Build Haxe
   run: |
     set -ex
-    opam exec -- make -s STATICLINK=1 haxe
+    export STATICLINK=1
+    export "LIB_PARAMS=/usr/local/lib/libz.a /usr/local/lib/libpcre2-8.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-framework Security -framework CoreFoundation'"
+    opam exec -- make -s haxe
     opam exec -- make -s haxelib
     make -s package_unix package_installer_mac
     otool -L ./haxe

diff --git a/extra/github-actions/workflows/main.yml b/extra/github-actions/workflows/main.yml
@@ -339,13 +339,6 @@ jobs:
         with:
           submodules: recursive
 
-      # - name: Cache opam
-      #   id: cache-opam
-      #   uses: actions/cache@v3.0.11
-      #   with:
-      #     path: ~/.opam/
-      #     key: ${{ runner.os }}-${{ hashFiles('./haxe.opam', './libs/') }}
-
       @import install-neko-unix.yml
       @import build-mac.yml
 

diff --git a/tests/Brewfile b/tests/Brewfile
@@ -1,2 +1 @@
-brew "cpanminus"
-brew "libunistring"
+brew "cpanminus"