Get rid of static linking patch (#5922)

* Fix reanalyze not found

* Get rid of static linking patch

Author: cknitt

.github/workflows/ci.yml

@@ -13,7 +13,6 @@ concurrency:
 
 env:
   OCAMLRUNPARAM: b
-  DUNE_PROFILE: release
 
 jobs:
   # Build statically linked Linux binaries in an Alpine-based Docker container
@@ -31,11 +30,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Apply static linking patch
-        run: git apply scripts/dune-static-linking.patch
-
       - name: Build compiler binaries
-        run: opam exec -- dune build
+        run: opam exec -- dune build --profile static
 
       - name: Build ninja binary
         working-directory: ninja
@@ -63,7 +59,6 @@ jobs:
     runs-on: ${{matrix.os}}
 
     env:
-      OCAMLRUNPARAM: b
       DUNE_PROFILE: release
 
     steps:
@@ -137,11 +132,11 @@ jobs:
 
       - name: "Syntax: Run roundtrip tests"
         if: ${{ env.syntax_status == 'changed' && runner.os != 'Windows' }}
-        run: make test-syntax-roundtrip
+        run: opam exec -- make test-syntax-roundtrip
 
       - name: "Syntax: Run tests (Windows)"
         if: ${{ env.syntax_status == 'changed' && runner.os == 'Windows' }}
-        run: make test-syntax
+        run: opam exec -- make test-syntax
 
       - name: Build runtime/stdlib
         if: runner.os != 'Windows'

jscomp/bsb_exe/dune

@@ -1,3 +1,8 @@
+(env
+ (static
+  (flags
+   (:standard -ccopt -static))))
+
 (executable
  (name rescript_main)
  (public_name rescript)

jscomp/bsb_helper_exe/dune

@@ -1,3 +1,8 @@
+(env
+ (static
+  (flags
+   (:standard -ccopt -static))))
+
 (executable
  (name bsb_helper_main)
  (public_name bsb_helper)

jscomp/bsc/dune

@@ -1,3 +1,8 @@
+(env
+ (static
+  (flags
+   (:standard -ccopt -static))))
+
 (executable
  (name rescript_compiler_main)
  (public_name bsc)

jscomp/cmij/dune

@@ -1,3 +1,8 @@
+(env
+ (static
+  (flags
+   (:standard -ccopt -static))))
+
 (executables
  (names cmij_main cmjdump_main)
  (public_names cmij cmjdump)

jscomp/dune

@@ -7,6 +7,11 @@
   (env-vars
    (CPPO_FLAGS -U=RELEASE)))
  (release
+  (env-vars
+   (CPPO_FLAGS -D=RELEASE))
+  (ocamlopt_flags
+   (:standard -O3 -unbox-closures)))
+ (static
   (env-vars
    (CPPO_FLAGS -D=RELEASE))
   (ocamlopt_flags

jscomp/ounit_tests/dune

@@ -1,3 +1,8 @@
+(env
+ (static
+  (flags
+   (:standard -ccopt -static))))
+
 (executable
  (name ounit_tests_main)
  (public_name ounit_tests)

res_syntax/benchmarks/dune

@@ -1,3 +1,8 @@
+(env
+ (static
+  (flags
+   (:standard -ccopt -static))))
+
 (executable
  (name benchmark)
  (public_name syntax_benchmarks)

res_syntax/cli/dune

@@ -1,3 +1,8 @@
+(env
+ (static
+  (flags
+   (:standard -ccopt -static))))
+
 (executable
  (name res_cli)
  (public_name res_parser)

res_syntax/testrunner/dune

@@ -1,3 +1,8 @@
+(env
+ (static
+  (flags
+   (:standard -ccopt -static))))
+
 (executable
  (name res_test)
  (public_name syntax_tests)