Skip to content

Commit

Permalink
Build system: Get rid of the unused EXTRALIBS variable
Browse files Browse the repository at this point in the history
  • Loading branch information
shindere committed May 6, 2022
1 parent 209b10e commit aac5b63
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 13 deletions.
1 change: 0 additions & 1 deletion Makefile.config.in
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ NATIVECCLIBS=@nativecclibs@
SYSTHREAD_SUPPORT=@systhread_support@
PACKLD=@PACKLD@
FLEXDLL_CHAIN=@flexdll_chain@
EXTRALIBS=@extralibs@
CCOMPTYPE=@ccomptype@
TOOLCHAIN=@toolchain@
CMXS=@cmxs@
Expand Down
3 changes: 0 additions & 3 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ SO="so"
toolchain="cc"
profinfo=false
profinfo_width=0
extralibs=
instrumented_runtime=true
force_instrumented_runtime=false
instrumented_runtime_libs=""
Expand Down Expand Up @@ -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])
Expand Down
4 changes: 0 additions & 4 deletions runtime/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions stdlib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion yacc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit aac5b63

Please sign in to comment.