Skip to content

Commit 0b2cfca

Browse files
rilliangraydon
authored andcommitted
Make ocamlc and optional dependency.
Since moving to a downloadable snapshot for stage0, it's been possible to complete the build without compiling code written in ocaml. However, the configure script still required it to be present. This commit changes detection failure to a non-fatal condition, allowing the build to complete on systems without an ocaml compiler. An info message is also made conditional.
1 parent 06f0713 commit 0b2cfca

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Diff for: Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ CFG_STDLIB :=$(call CFG_LIB_NAME,std)
3838
ifdef CFG_OCAMLC_OPT
3939
$(info cfg: have ocaml native compiler)
4040
OPT=.opt
41-
else
41+
else ifdef CFG_OCAMLC
4242
$(info cfg: have only ocaml bytecode compiler)
4343
endif
4444

Diff for: configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ putvar CFG_CONFIGURE_ARGS
186186
step_msg "looking for build programs"
187187
probe_need CFG_GCC gcc
188188
probe_need CFG_GIT git
189-
probe_need CFG_OCAMLC ocamlc
190189
probe_need CFG_PERL perl
191190
probe_need CFG_PYTHON python
192191
probe_need CFG_CURL curl
193192

194193
probe CFG_LLVM_CONFIG llvm-config
195194
probe CFG_VALGRIND valgrind
195+
probe CFG_OCAMLC ocamlc
196196
probe CFG_OCAMLOPT ocamlopt
197197
probe CFG_OCAMLC_OPT ocamlc.opt
198198
probe CFG_OCAMLOPT_OPT ocamlopt.opt

0 commit comments

Comments
 (0)