diff --git a/Makefile.config.in b/Makefile.config.in index 05535bb9c394..ebe398e0e033 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -204,7 +204,6 @@ NATIVECCLIBS=@nativecclibs@ SYSTHREAD_SUPPORT=@systhread_support@ PACKLD=@PACKLD@ FLEXDLL_CHAIN=@flexdll_chain@ -EXTRALIBS=@extralibs@ CCOMPTYPE=@ccomptype@ TOOLCHAIN=@toolchain@ CMXS=@cmxs@ diff --git a/configure b/configure index 127d53dde7e7..f32ab7ec39a8 100755 --- a/configure +++ b/configure @@ -814,7 +814,6 @@ ccomptype mkexedebugflag mkexe fpic -extralibs syslib outputobj outputexe @@ -2805,7 +2804,6 @@ SO="so" toolchain="cc" profinfo=false profinfo_width=0 -extralibs= instrumented_runtime=true force_instrumented_runtime=false instrumented_runtime_libs="" @@ -2917,7 +2915,6 @@ OCAML_VERSION_SHORT=5.0 - # TODO: rename this variable diff --git a/configure.ac b/configure.ac index 390d9eccf2bf..3eac1be7d11d 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,6 @@ SO="so" toolchain="cc" profinfo=false profinfo_width=0 -extralibs= instrumented_runtime=true force_instrumented_runtime=false instrumented_runtime_libs="" @@ -102,7 +101,6 @@ AC_SUBST([unix_or_win32]) AC_SUBST([outputexe]) AC_SUBST([outputobj]) AC_SUBST([syslib]) -AC_SUBST([extralibs]) AC_SUBST([fpic]) AC_SUBST([mkexe]) AC_SUBST([mkexedebugflag]) diff --git a/runtime/Makefile b/runtime/Makefile index fa48ecff6769..33849c6a83b7 100644 --- a/runtime/Makefile +++ b/runtime/Makefile @@ -168,10 +168,6 @@ OC_INSTR_CPPFLAGS=-DCAML_INSTR LIBS := $(BYTECCLIBS) -ifeq "$(UNIX_OR_WIN32)" "win32" -LIBS += $(EXTRALIBS) -endif - # Build, install and clean targets .PHONY: all diff --git a/stdlib/Makefile b/stdlib/Makefile index 490940f98398..b8b379b1a88b 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -157,7 +157,7 @@ camlhead%: tmphead%.exe # Again, pattern weirdness here means that the dot is always present so that # tmpheader.exe matches. tmpheader%exe: $(HEADERPROGRAM)%$(O) - $(call MKEXE_USING_COMPILER,$@,$^ $(EXTRALIBS)) + $(call MKEXE_USING_COMPILER,$@,$^) # FIXME This is wrong - mingw could invoke strip; MSVC equivalent? ifneq "$(UNIX_OR_WIN32)" "win32" strip $@ @@ -175,7 +175,7 @@ camlheader_ur: camlheader ifeq "$(UNIX_OR_WIN32)" "unix" tmptargetcamlheader%exe: $(TARGETHEADERPROGRAM)%$(O) - $(call MKEXE_USING_COMPILER,$@,$^ $(EXTRALIBS)) + $(call MKEXE_USING_COMPILER,$@,$^) strip $@ $(TARGETHEADERPROGRAM)%$(O): $(HEADERPROGRAM).c diff --git a/yacc/Makefile b/yacc/Makefile index 55438317e6c1..80542eee7d4d 100644 --- a/yacc/Makefile +++ b/yacc/Makefile @@ -36,7 +36,7 @@ generated_files := ocamlyacc$(EXE) $(ocamlyacc_OBJECTS) all: ocamlyacc$(EXE) ocamlyacc$(EXE): $(ocamlyacc_OBJECTS) - $(MKEXE) -o $@ $^ $(EXTRALIBS) + $(MKEXE) -o $@ $^ .PHONY: clean clean: