New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge build systems in the byterun directory #981

Merged
merged 24 commits into from Dec 29, 2016
Commits
Jump to file or symbol
Failed to load files and symbols.
+9 −5
Diff settings

Always

Just for now

Viewing a subset of changes. View all

byterun/makefiles: introduce the LIBS variable

This makes the rules used to build the runtime systems closer to each
other between the two build systems.
  • Loading branch information...
shindere committed Dec 20, 2016
commit 85e12746336157e70e5b7e0b546af803b1e1d86d
View
@@ -21,14 +21,16 @@ ifeq "$(SUPPORTS_SHARED_LIBRARIES)" "true"
all:: libcamlrun_pic.a libcamlrun_shared.so
endif
LIBS = $(BYTECCLIBS)
ocamlrun$(EXE): prims.$(O) libcamlrun.$(A)
$(MKEXE) $(BYTECCLINKOPTS) -o $@ $^ $(BYTECCLIBS)
$(MKEXE) $(BYTECCLINKOPTS) -o $@ $^ $(LIBS)
ocamlrund$(EXE): prims.$(O) libcamlrund.$(A)
$(MKEXE) $(MKEXEDEBUGFLAG) $(BYTECCLINKOPTS) -o $@ $^ $(BYTECCLIBS)
$(MKEXE) $(MKEXEDEBUGFLAG) $(BYTECCLINKOPTS) -o $@ $^ $(LIBS)
ocamlruni$(EXE): prims.$(O) libcamlruni.$(A)
$(MKEXE) $(BYTECCLINKOPTS) -o $@ $^ $(BYTECCLIBS)
$(MKEXE) $(BYTECCLINKOPTS) -o $@ $^ $(LIBS)
install::
ifeq "$(SUPPORTS_SHARED_LIBRARIES)" "true"
View
@@ -21,11 +21,13 @@ else
MAKE_OCAMLRUN=$(MKEXE) -o $(1) $(2)
endif
LIBS = $(call SYSLIB,ws2_32) $(EXTRALIBS)
ocamlrun$(EXE): prims.$(O) libcamlrun.$(A)
$(call MAKE_OCAMLRUN,$@,$^ $(call SYSLIB,ws2_32) $(EXTRALIBS))
$(call MAKE_OCAMLRUN,$@,$^ $(LIBS))
ocamlrund$(EXE): prims.$(O) libcamlrund.$(A)
$(MKEXE) -o $@ $^ $(call SYSLIB,ws2_32) $(EXTRALIBS)
$(MKEXE) -o $@ $^ $(LIBS)
.depend.nt: .depend
rm -f .depend.win32
ProTip! Use n and p to navigate between commits in a pull request.