Relax things to *mostly* statically linked

Signed-off-by: Kevin Svetlitski <ksvetlitski@janestreet.com>

Author: Svetlitski

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-latest
+          - ubuntu_x64_8_cores
         ocaml-version:
           - '5.2.0+ox'
 
@@ -21,12 +21,12 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ~/.opam
-          key: ${{ matrix.os }}-opam-${{ matrix.ocaml-version }}-flambda-musl-v6
+          key: ${{ matrix.os }}-opam-${{ matrix.ocaml-version }}
 
       - name: "Install apt packages"
         run: |
           sudo apt-get update
-          sudo apt-get install bubblewrap musl-tools libucl1 linux-headers-generic
+          sudo apt-get install bubblewrap libucl1 linux-headers-generic
           sudo apt-get autoremove
           sudo apt-get clean
           echo 'Removing extraneous default packages to free up disk space'
@@ -40,39 +40,37 @@ jobs:
           sudo dpkg -i upx-ucl_3.96-2_amd64.deb
           rm -f upx-ucl_3.96-2_amd64.deb
 
-      - name: Build zlib with musl
+      - name: Build zlib
         run: |
-          mkdir musl-zlib
-          curl -L https://zlib.net/zlib-1.3.1.tar.gz | tar -xz -C musl-zlib --strip-components=1
-          cd musl-zlib
-          CC=musl-gcc ./configure --libdir=/usr/lib/x86_64-linux-musl --includedir=/usr/include/x86_64-linux-musl
+          mkdir zlib
+          curl -L https://zlib.net/zlib-1.3.1.tar.gz | tar -xz -C zlib --strip-components=1
+          cd zlib
+          ./configure
           make -j$(nproc)
           sudo make install
           cd ..
-          rm -rf musl-zlib
+          rm -rf zlib
 
-      - name: Build zstd with musl
+      - name: Build zstd
         run: |
-          mkdir musl-zstd
+          mkdir zstd
           curl -L https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz | \
-            tar -xz -C musl-zstd --strip-components=1
-          cd musl-zstd
-          CC=musl-gcc make -j$(nproc)
-          sudo make INCLUDEDIR=/usr/include/x86_64-linux-musl LIBDIR=/usr/lib/x86_64-linux-musl install
+            tar -xz -C zstd --strip-components=1
+          cd zstd
+          make -j$(nproc)
+          sudo make install
           cd ..
-          rm -rf musl-zstd
+          rm -rf zstd
 
       - name: Use OCaml ${{ matrix.ocaml-version }}
         run: |
-          sudo wget -O /usr/local/bin/opam https://github.com/ocaml/opam/releases/download/2.1.2/opam-2.1.2-x86_64-linux
+          sudo wget -O /usr/local/bin/opam https://github.com/ocaml/opam/releases/download/2.5.0/opam-2.5.0-x86_64-linux
           sudo chmod a+x /usr/local/bin/opam
 
           export OPAMYES=1
           export OPAMJOBS=$(($(nproc) + 2))
-          export CC=musl-gcc
           echo "OPAMYES=1" >> "$GITHUB_ENV"
           echo "OPAMJOBS=$OPAMJOBS" >> "$GITHUB_ENV"
-          echo "CC=musl-gcc" >> "$GITHUB_ENV"
 
           opam init --bare -yav https://github.com/ocaml/opam-repository.git
           opam switch create ${{ matrix.ocaml-version }} --repos ox=git+https://github.com/oxcaml/opam-repository.git,default

dune

@@ -1,6 +1,6 @@
 (env
  (static
   (flags
-   (:standard -cclib -static))))
+   (:standard -cclib -Wl,-Bstatic -cclib -lz -cclib -lzstd -cclib -Wl,-Bdynamic))))
 
 (vendored_dirs vendor)