diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2012-09-30 12:31:27 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2012-09-30 12:31:27 +0000 |
| commit | de1ac52bc6edfe967983d68c352dedfbfa25cce6 (patch) | |
| tree | 40772dd8bfd16edb6cd0149361db6344990cef6e | |
| parent | 8690cc75311920a057eb8886545b344a94d12fb4 (diff) | |
PR#5715: change the fix to avoid breaking the mingw port
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12978 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Changes | 1 | ||||
| -rw-r--r-- | otherlibs/labltk/lib/Makefile | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -44,6 +44,7 @@ Bug fixes: - PR#5707: AMD64 code generator: do not use r10 and r11 for parameter passing, as these registers can be destroyed by the dynamic loader - PR#5712: some documentation problems +- PR#5715: configuring with -no-shared-libs breaks under cygwin - PR#5719: ocamlyacc generates code that is not warning 33-compliant - PR#5727: emacs caml-mode indents shebang line in toplevel scripts - PR#5731: instruction scheduling forgot to account for destroyed registers diff --git a/otherlibs/labltk/lib/Makefile b/otherlibs/labltk/lib/Makefile index ac128baaa..cc3e4145d 100644 --- a/otherlibs/labltk/lib/Makefile +++ b/otherlibs/labltk/lib/Makefile @@ -21,7 +21,7 @@ all: $(LIBNAME).cma $(LIBNAME)top$(EXE) $(LIBNAME) opt: $(LIBNAME).cmxa clean: - rm -f $(LIBNAME)top$(EXE) $(LIBNAME) *.cm* *.$(A) + rm -f $(LIBNAME)top$(EXE) $(LIBNAME) *.cm* *.$(A) *$(EXT_DLL) superclean: - if test -f tk.cmo; then \ @@ -56,7 +56,7 @@ $(LIBNAME).cma: $(SUPPORT) ../Widgets.src cd ../camltk; $(MAKE) $(MKLIB) -ocamlc '$(CAMLCB)' -o $(LIBNAME) \ -I ../labltk -I ../camltk $(TKOBJS) \ - $(TK_LINK) + -cclib "\"$(TK_LINK)\"" $(LIBNAME).cmxa: $(SUPPORT:.cmo=.cmx) ../Widgets.src $(MAKE) superclean @@ -64,7 +64,7 @@ $(LIBNAME).cmxa: $(SUPPORT:.cmo=.cmx) ../Widgets.src cd ../camltk; $(MAKE) opt $(MKLIB) -ocamlopt '$(CAMLOPTB)' -o $(LIBNAME) -oc $(LIBNAME) \ -I ../labltk -I ../camltk $(TKOBJS:.cmo=.cmx) \ - $(TK_LINK) + -cclib "\"$(TK_LINK)\"" $(LIBNAME)top$(EXE) : $(TOPDEPS) $(LIBNAME).cma ../support/lib$(LIBNAME).$(A) $(CAMLC) -verbose -linkall -o $(LIBNAME)top$(EXE) -I ../support \ |