Fixing mac build: negating Darwin ~~> OKaying linux

Signed-off-by: Kakadu <[email protected]>
PLTools · Sep 5, 2024 · aaf0bdc · aaf0bdc
1 parent 0b2598e
commit aaf0bdc
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 102 deletions.
diff --git a/byterun/Makefile b/byterun/Makefile
diff --git a/performance/Makefile b/performance/Makefile
diff --git a/runtime/Makefile b/runtime/Makefile
diff --git a/runtime32/Makefile b/runtime32/Makefile
diff --git a/runtime32/dune b/runtime32/dune
@@ -1,7 +1,7 @@
 (rule
  (target runtime.a)
  (enabled_if
-  (<> %{ocaml-config:os_type} "Darwin"))
+  (= %{system} "linux"))
  (mode
   (promote (until-clean)))
  (deps Makefile gc_runtime.s runtime.c runtime.h)

diff --git a/stdlib/x32/dune b/stdlib/x32/dune
@@ -1,6 +1,6 @@
 (rule
  (enabled_if
-  (<> %{ocaml-config:os_type} "Darwin"))
+  (<> %{system} "linux"))
  (deps
   ../Makefile
   ../../runtime32/Std.i

diff --git a/tools/Makefile b/tools/Makefile
diff --git a/tutorial/dune b/tutorial/dune
@@ -1,7 +1,7 @@
 
 (rule
  (targets Expressions.x32.exe)
- (enabled_if (<> %{ocaml-config:os_type} "Darwin"))
+ (enabled_if (= %{ocaml-config:os_type} "linux"))
  (deps (:lama Expressions.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i)
  (mode
   (promote (until-clean)))
@@ -43,7 +43,7 @@
 
 (rule
  (targets Functions.x32.exe)
- (enabled_if (<> %{ocaml-config:os_type} "Darwin"))
+ (enabled_if (= %{ocaml-config:os_type} "linux"))
  (deps (:lama Functions.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i)
  (mode
   (promote (until-clean)))
@@ -85,7 +85,7 @@
 
 (rule
  (targets Hello.x32.exe)
- (enabled_if (<> %{ocaml-config:os_type} "Darwin"))
+ (enabled_if (= %{ocaml-config:os_type} "linux"))
  (deps (:lama Hello.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i)
  (mode
   (promote (until-clean)))
@@ -127,7 +127,7 @@
 
 (rule
  (targets PatternMatching.x32.exe)
- (enabled_if (<> %{ocaml-config:os_type} "Darwin"))
+ (enabled_if (= %{ocaml-config:os_type} "linux"))
  (deps (:lama PatternMatching.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i)
  (mode
   (promote (until-clean)))
@@ -169,7 +169,7 @@
 
 (rule
  (targets Values.x32.exe)
- (enabled_if (<> %{ocaml-config:os_type} "Darwin"))
+ (enabled_if (= %{ocaml-config:os_type} "linux"))
  (deps (:lama Values.lama) ../runtime32/runtime.a ../stdlib/x32/Fun.i)
  (mode
   (promote (until-clean)))

diff --git a/tutorial/gen.ml b/tutorial/gen.ml
@@ -31,7 +31,7 @@ let () =
       template
       |> Str.global_replace (Str.regexp "%DEMO%") (demo^".x32")
       |> Str.global_replace (Str.regexp "%DEMOSRC%") demo
-      |> Str.global_replace (Str.regexp "%COND%") {|(enabled_if (<> %{ocaml-config:os_type} "Darwin"))|}
+      |> Str.global_replace (Str.regexp "%COND%") {|(enabled_if (= %{ocaml-config:os_type} "linux"))|}
       |> Str.global_replace (Str.regexp "%RUNTIME%") "../runtime32"
       |> Str.global_replace (Str.regexp "%STDLIB%") "../stdlib/x32"
       |> Str.global_replace (Str.regexp "%EXTRASWITCHES%") "-march=x86"