Skip to content

Commit bed9e7a

Browse files
committed
Update lockdir
1 parent 239861c commit bed9e7a

File tree

7 files changed

+15
-79
lines changed

7 files changed

+15
-79
lines changed

dune.lock/base-bytes.pkg

Lines changed: 0 additions & 3 deletions
This file was deleted.

dune.lock/cf.pkg

Lines changed: 0 additions & 32 deletions
This file was deleted.

dune.lock/conf-pkg-config.pkg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(version 4)
22

33
(build
4-
(run pkgconf --version))
4+
(run pkg-config --help))
55

6-
(depexts pkgconf)
6+
(depexts pkg-config)

dune.lock/conf-sdl2.pkg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,3 @@
44
(run pkg-config sdl2))
55

66
(depends conf-pkg-config)
7-
8-
(depexts sdl2)

dune.lock/fsevents.pkg

Lines changed: 0 additions & 17 deletions
This file was deleted.

dune.lock/lock.dune

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@
1616
(variable_values
1717
(with-doc false)
1818
(with-dev-setup false)
19-
(sys-ocaml-version 5.3.0)
19+
(sys-ocaml-version 4.13.1)
2020
(post true)
21-
(os-version 15.5)
22-
(os-distribution homebrew)
23-
(os macos)
21+
(os-version 24.11)
22+
(os-distribution nixos)
23+
(os linux)
2424
(opam-version 2.2.0~alpha-vendored)
25-
(arch arm64))
25+
(arch x86_64))
2626
(unset_variables
2727
with-test
2828
sys-ocaml-libc
2929
sys-ocaml-cc
3030
sys-ocaml-arch
31+
enable-ocaml-beta-repository
3132
dev
3233
build))

dune.lock/ocaml-compiler.pkg

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,6 @@
5858
(when
5959
(catch_undefined_var %{pkg:ocaml-option-tsan:installed} false)
6060
--enable-tsan)
61-
(when
62-
(catch_undefined_var
63-
(and_absorb_undefined_var
64-
(not %{pkg:ocaml-option-32bit:installed})
65-
(not %{pkg:ocaml-option-musl:installed})
66-
true)
67-
false)
68-
CC=cc)
69-
(when
70-
(catch_undefined_var
71-
(and_absorb_undefined_var %{pkg:ocaml-option-tsan:installed} true)
72-
false)
73-
CC=clang)
7461
(when
7562
(catch_undefined_var
7663
(and_absorb_undefined_var %{pkg:ocaml-option-musl:installed} true)
@@ -80,12 +67,14 @@
8067
(catch_undefined_var
8168
(and_absorb_undefined_var %{pkg:ocaml-option-musl:installed} true)
8269
false)
83-
"CFLAGS=-Os -mno-outline-atomics")
70+
CFLAGS=-Os)
8471
(when
8572
(catch_undefined_var
8673
(or_absorb_undefined_var
8774
%{pkg:ocaml-option-leak-sanitizer:installed}
88-
false)
75+
(and_absorb_undefined_var
76+
%{pkg:ocaml-option-address-sanitizer:installed}
77+
true))
8978
false)
9079
LDFLAGS=-Wl,--no-as-needed,-ldl)
9180
(when
@@ -97,12 +86,12 @@
9786
%{pkg:ocaml-option-address-sanitizer:installed}
9887
true)
9988
false)
100-
"CC=clang -fsanitize=address -fno-omit-frame-pointer -O1 -g")
89+
"CC=gcc -ldl -fsanitize=address -fno-omit-frame-pointer -O1 -g")
10190
(when
10291
(catch_undefined_var
10392
(and_absorb_undefined_var %{pkg:ocaml-option-32bit:installed} true)
10493
false)
105-
"CC=gcc -Wl,-read_only_relocs,suppress -arch i386 -m32")
94+
"CC=gcc -m32")
10695
(when
10796
(catch_undefined_var
10897
(and_absorb_undefined_var %{pkg:ocaml-option-musl:installed} true)
@@ -112,7 +101,7 @@
112101
(catch_undefined_var
113102
(and_absorb_undefined_var %{pkg:ocaml-option-32bit:installed} true)
114103
false)
115-
--host=i386-apple-darwin13.2.0)
104+
--host=i386-linux)
116105
(when
117106
(catch_undefined_var %{pkg:ocaml-option-static:installed} false)
118107
LIBS=-static)

0 commit comments

Comments
 (0)