diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2000-04-04 03:29:55 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2000-04-04 03:29:55 +0000 |
| commit | f38a89b97e7a9b818755d70b5da2a152922b9c3c (patch) | |
| tree | 126e87a32a19c951fa78746dfe99cbd8cf3b2e71 | |
| parent | e8fb4b3603e99bb9f35cd434774a264aacca16c3 (diff) | |
utilise -ccopt plutot que -cclib
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3033 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | otherlibs/labltk/lib/Makefile | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -924,7 +924,8 @@ fi if test $has_tk = true; then echo "TK_DEFS=$tk_defs" >> Makefile - echo "TK_LINK=$tk_libs" | sed -e 's/-[lL]/-cclib &/g' >> Makefile + echo "TK_LINK=$tk_libs" \ + | sed -e 's/-l/-cclib &/g' -e 's/-L/-ccopt &/g' >> Makefile otherlibraries="$otherlibraries labltk" else echo "Configuration failed, LablTk will not be built." diff --git a/otherlibs/labltk/lib/Makefile b/otherlibs/labltk/lib/Makefile index 1962be9c3..1f54cbed5 100644 --- a/otherlibs/labltk/lib/Makefile +++ b/otherlibs/labltk/lib/Makefile @@ -37,12 +37,12 @@ labltk: Makefile $(TOPDIR)/config/Makefile labltklink: Makefile $(TOPDIR)/config/Makefile @echo Generate $@ @echo "#!/bin/sh" > $@ - @echo 'exec ocamlc -I $(LABLTKDIR) -cclib -L$(LABLTKDIR) tk41.cma "$$@"' >> $@ + @echo 'exec ocamlc -I $(LABLTKDIR) -ccopt -L$(LABLTKDIR) tk41.cma "$$@"' >> $@ labltkopt: Makefile $(TOPDIR)/config/Makefile @echo Generate $@ @echo "#!/bin/sh" > $@ - @echo 'exec ocamlopt -I $(LABLTKDIR) -cclib -L$(LABLTKDIR) tk41.cmxa "$$@" ' >> $@ + @echo 'exec ocamlopt -I $(LABLTKDIR) -ccopt -L$(LABLTKDIR) tk41.cmxa "$$@" ' >> $@ # All .{ml,mli} files are generated in this directory clean : |