Merge pull request #1074 from ocsigen/fix-32bit

Fix 32bit build

Author: raphael-proust

.github/workflows/workflow.yml

@@ -39,28 +39,14 @@ jobs:
           - os: windows-latest
             ocaml-compiler: "5.3"
             libev: false
+          - os: ubuntu-latest
+            ocaml-compiler: "ocaml-variants.5.3.0+options,ocaml-option-32bit"
+            libev: false
+
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: set ppx-related variables
-        id: configppx
-        shell: bash
-        run: |
-          case ${{ matrix.ocaml-compiler }} in
-            "4.08"|"4.09"|"4.10"|"4.11"|"4.12"|"4.13"|"4.14"|"5.0")
-              echo "letppx=false"
-              echo "letppx=false" >> "$GITHUB_OUTPUT"
-              ;;
-            "5.1"|"5.2"|"5.3")
-              echo "letppx=true"
-              echo "letppx=true" >> "$GITHUB_OUTPUT"
-              ;;
-            *)
-              printf "unrecognised version %s\n" "${{ matrix.ocaml-compiler }}";
-              exit 1
-              ;;
-          esac
 
       - name: Checkout tree
         uses: actions/checkout@v5
@@ -70,6 +56,13 @@ jobs:
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
 
+      - name: set ppx-related variables
+        id: configppx
+        shell: bash
+        run: |
+          opam exec -- ocaml src/util/letppx.ml
+          opam exec -- ocaml src/util/letppx.ml >> "$GITHUB_OUTPUT"
+
       - run: opam install conf-libev
         if: ${{ matrix.libev == true }}
 

src/unix/dune

@@ -189,6 +189,7 @@
    windows_somaxconn
    unix_accept4)
   (flags
+   (:standard)
    (:include unix_c_flags.sexp)))
  (c_library_flags
   (:include unix_c_library_flags.sexp))

src/util/dune

@@ -0,0 +1,2 @@
+(executable
+ (name letppx))

src/util/letppx.ml

@@ -0,0 +1,7 @@
+let () =
+  match String.split_on_char '.' Sys.ocaml_version with
+  | "4" :: _ | "5" :: "0" :: _ -> print_endline "letppx=false"
+  | "5" :: _ -> print_endline "letppx=true"
+  | _ ->
+      print_endline ("unrecognised version " ^ Sys.ocaml_version);
+      exit 1