Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start testing on OCaml 4.13 #88

Merged
merged 15 commits into from
Oct 2, 2021
Merged

Start testing on OCaml 4.13 #88

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6837265
Start testing on OCaml 4.13
anmonteiro Aug 15, 2021
0ba7557
wip
anmonteiro Aug 15, 2021
e968dab
reason support, baby
anmonteiro Sep 26, 2021
eaf2a6c
merlin
anmonteiro Sep 26, 2021
40f830d
fix camlp5 for ocaml 4.13
anmonteiro Sep 26, 2021
b52e70a
use old reason for 4.12 for now still
anmonteiro Sep 27, 2021
2fad3f4
dont build hol_light
anmonteiro Sep 27, 2021
7b318d1
fix a few mroe
anmonteiro Sep 27, 2021
f114005
updated reason hash
anmonteiro Sep 27, 2021
e5ea0d3
let 4.13 fail for now
anmonteiro Sep 27, 2021
3ca39e9
fix the rest
anmonteiro Sep 27, 2021
061501f
fix a few typos
anmonteiro Sep 27, 2021
622e160
working 4.13 cross compiler
anmonteiro Sep 27, 2021
e181208
fix a lib
anmonteiro Sep 27, 2021
ec2ad54
oops
anmonteiro Oct 2, 2021
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
Prev Previous commit
Next Next commit
working 4.13 cross compiler
  • Loading branch information
@anmonteiro
anmonteiro committed Oct 2, 2021
commit 622e160061d4d18cdb914711b6c9091a6abe4cbe
28 changes: 28 additions & 0 deletions cross/cross_4_13.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/runtime/Makefile b/runtime/Makefile
index 3e40bdc6e..e8e4bc404 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -265,7 +265,9 @@ build_config.h: $(ROOTDIR)/Makefile.config sak$(EXE)
# Libraries and programs

ocamlrun$(EXE): prims.$(O) libcamlrun.$(A)
- $(MKEXE) -o $@ $^ $(LIBS)
+ cp $(OCAMLRUN) $@
+ chmod 755 $@
+ # $(MKEXE) -o $@ $^ $(LIBS)

ocamlruns$(EXE): prims.$(O) libcamlrun_non_shared.$(A)
$(call MKEXE_USING_COMPILER,$@,$^ $(LIBS))
diff --git a/tools/Makefile b/tools/Makefile
index 094f213e0..b20cefb3e 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -316,7 +316,7 @@ caml_tex := caml-tex$(EXE)
# configuration.
$(caml_tex): INCLUDES += $(addprefix -I $(ROOTDIR)/otherlibs/,str $(UNIXLIB))
$(caml_tex): $(caml_tex_files)
- $(OCAMLRUN) $(ROOTDIR)/ocamlc$(EXE) -nostdlib -I $(ROOTDIR)/stdlib \
+ $(CAMLC) -nostdlib -I $(ROOTDIR)/stdlib \
$(LINKFLAGS) -linkall -o $@ -no-alias-deps $^

# we need str and unix which depend on the bytecode version of other tools
12 changes: 9 additions & 3 deletions cross/ocaml.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@ in
configureFlagsArray+=("PARTIALLD=$LD -r" "ASPP=$CC -c")
'';
configureFlags = o.configureFlags ++ [ "--disable-ocamldoc" ];
postConfigure = ''
echo 'SAK_CC=${buildPackages.stdenv.cc}/bin/gcc' >> Makefile.config
echo 'SAK_CFLAGS=$(OC_CFLAGS) $(OC_CPPFLAGS)' >> Makefile.config
echo 'SAK_LINK=$(SAK_CC) $(SAK_CFLAGS) $(OUTPUTEXE)$(1) $(2)' >> Makefile.config
'';

buildPhase = ''
runHook preBuild
Expand Down Expand Up @@ -235,9 +240,10 @@ in
'';
installTargets = o.installTargets ++ [ "installoptopt" ];
patches = [
(if lib.versionOlder "4.12" ocaml.version then ./cross_4_12.patch
else if lib.versionOlder "4.11" ocaml.version then ./cross_4_11.patch else
throw "OCaml ${ocaml.version} not supported for cross-compilation")
(if lib.versionOlder "4.13" ocaml.version then ./cross_4_13.patch
else if lib.versionOlder "4.12" ocaml.version then ./cross_4_12.patch
else if lib.versionOlder "4.11" ocaml.version then ./cross_4_11.patch
else throw "OCaml ${ocaml.version} not supported for cross-compilation")
];
});
fixOCamlPackage = b:
Expand Down