Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Lama.opam
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@ build: [
"@doc" {with-doc}
]
]
depexts: [ [ "gcc-14-multilib" ] {os-distribution = "ubuntu"} ]
depexts: [
[ "gcc-i686-linux-gnu" "linux-libc-dev:i386" "libc6-dev-i386-cross"] {os-distribution = "ubuntu"}
[ "libgcc-13-dev-i386-cross" ] {os-distribution = "ubuntu" & os-version >= "24.04" }
[ "libgcc-14-dev-i386-cross" ] {os-distribution = "ubuntu" & os-version >= "24.04" }
]
6 changes: 5 additions & 1 deletion Lama.opam.template
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
depexts: [ [ "gcc-14-multilib" ] {os-distribution = "ubuntu"} ]
depexts: [
[ "gcc-i686-linux-gnu" "linux-libc-dev:i386" "libc6-dev-i386-cross"] {os-distribution = "ubuntu"}
[ "libgcc-13-dev-i386-cross" ] {os-distribution = "ubuntu" & os-version >= "24.04" }
[ "libgcc-14-dev-i386-cross" ] {os-distribution = "ubuntu" & os-version >= "24.04" }
]
1 change: 1 addition & 0 deletions runtime32/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
RUNTIME=runtime.a

.DEFAULT := $(RUNTIME)
CC := i686-linux-gnu-gcc

$(RUNTIME): gc_runtime.o runtime.o
ar rc $@ gc_runtime.o runtime.o
Expand Down
4 changes: 2 additions & 2 deletions src/X86_32.ml
Original file line number Diff line number Diff line change
Expand Up @@ -833,8 +833,8 @@ let build cmd prog =
let objs = find_objects (fst @@ fst prog) cmd#get_include_paths in
let buf = Buffer.create 255 in
List.iter (fun o -> Buffer.add_string buf o; Buffer.add_string buf " ") objs;
let gcc_cmdline = Printf.sprintf "gcc %s -m32 %s %s.s %s %s/runtime.a" cmd#get_debug cmd#get_output_option cmd#basename (Buffer.contents buf) inc in
let gcc_cmdline = Printf.sprintf "i686-linux-gnu-gcc %s %s %s.s %s %s/runtime.a" cmd#get_debug cmd#get_output_option cmd#basename (Buffer.contents buf) inc in
Sys.command gcc_cmdline
| `Compile ->
Sys.command (Printf.sprintf "gcc %s -m32 -c %s.s" cmd#get_debug cmd#basename)
Sys.command (Printf.sprintf "i686-linux-gnu-gcc %s -c %s.s" cmd#get_debug cmd#basename)
| _ -> invalid_arg "must not happen"
Loading