diff options
| author | Zackery Spytz <zspytz@gmail.com> | 2019-01-25 01:58:48 -0700 |
|---|---|---|
| committer | Zackery Spytz <zspytz@gmail.com> | 2019-01-25 01:58:48 -0700 |
| commit | 25e650e7d8ce8973f4d94b3cbfe727d8b1371702 (patch) | |
| tree | ad359a23561eac22cdefcde2ca2431a9dc2fdaa2 /Examples/Makefile.in | |
| parent | 4ca7cd7b27bf23c33b755ac986ae236a85aeac41 (diff) | |
| download | swig-25e650e7d8ce8973f4d94b3cbfe727d8b1371702.tar.gz | |
[OCaml] Fix toplevel creation for ocamlmktop versions >= 4.04.0
The -o and -c options of ocamlc/ocamlopt were modified to be stricter
in 4.04.0.
https://github.com/ocaml/ocaml/commit/da56cf6dfdc13c09905c2e07f1d4849c8346eec8
The changes in Examples/Makefile.in are compatible with earlier OCaml
versions (at least back to 3.12.0).
Diffstat (limited to 'Examples/Makefile.in')
| -rw-r--r-- | Examples/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Examples/Makefile.in b/Examples/Makefile.in index b11eda2cd..e0f1ce20d 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -899,7 +899,7 @@ mzscheme_clean: OCC=$(COMPILETOOL) @OCAMLC@ OCAMLDLGEN=$(COMPILETOOL) @OCAMLDLGEN@ OCAMLFIND=$(COMPILETOOL) @OCAMLFIND@ -OCAMLMKTOP=$(COMPILETOOL) @OCAMLMKTOP@ $(SWIGWHERE) +OCAMLMKTOP=$(COMPILETOOL) @OCAMLMKTOP@ NOLINK ?= false OCAMLPP= -pp "camlp4o ./swigp4.cmo" OCAMLP4WHERE=`$(COMPILETOOL) @CAMLP4@ -where` @@ -939,7 +939,7 @@ ocaml_static_toplevel: $(SRCDIR_SRCS) $(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml) test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE) - $(NOLINK) || $(OCAMLMKTOP) swig.cmo -I $(OCAMLP4WHERE) camlp4o.cma swigp4.cmo -g -ccopt -g -cclib -g -custom -o $(RUNME)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" + $(NOLINK) || $(OCAMLMKTOP) swig.cmo -I $(OCAMLP4WHERE) dynlink.cma camlp4o.cma swigp4.cmo -cclib "$(LIBS)" -g -ccopt -g -cclib -g -custom -o $(RUNME)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) ocaml_static_cpp: $(SRCDIR_SRCS) $(OCAMLCORE) @@ -959,7 +959,7 @@ ocaml_static_cpp_toplevel: $(SRCDIR_SRCS) $(OCC) -g -c $(INTERFACE:%.i=%.mli) $(OCC) -w -U -g -c $(INTERFACE:%.i=%.ml) test -z "$(PROGFILE)" || $(OCC) -o $(PROGFILE:%.ml=%) $(OCAMLPP) -c $(SRCDIR)$(PROGFILE) - $(NOLINK) || $(OCAMLMKTOP) swig.cmo -I $(OCAMLP4WHERE) dynlink.cma camlp4o.cma swigp4.cmo -g -ccopt -g -cclib -g -custom -o $(RUNME)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) -cclib "$(LIBS)" -cc '$(CXX)' + $(NOLINK) || $(OCAMLMKTOP) -cc '$(CXX) $(CPPFLAGS)' swig.cmo -I $(OCAMLP4WHERE) dynlink.cma camlp4o.cma swigp4.cmo -cclib "$(LIBS)" -g -ccopt -g -cclib -g -custom -o $(RUNME)_top $(INTERFACE:%.i=%.cmo) $(INTERFACE:%.i=%_wrap.@OBJEXT@) $(OBJS) ocaml_dynamic_cpp: $(SRCDIR_SRCS) $(OCAMLCORE) |