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.
+4 −6
Diff settings

Always

Just for now

Viewing a subset of changes. View all

byterun/Makefile.nt: simplify and generalize the rules building ocaml…

…run and ocamlrund

ocamlrund had main.$O) as a prerequisite but did not actually link this
object file so it has been removed from the list of prerequisites.
  • Loading branch information...
shindere committed Dec 20, 2016
commit ab81c1fa4769d36a366bf271e4f9c41c1fa2f0f6
View
@@ -21,13 +21,11 @@ else
MAKE_OCAMLRUN=$(MKEXE) -o $(1) $(2)
endif
ocamlrun$(EXE): libcamlrun.$(A) prims.$(O)
$(call MAKE_OCAMLRUN,ocamlrun$(EXE),prims.$(O) libcamlrun.$(A) \
$(call SYSLIB,ws2_32) $(EXTRALIBS))
ocamlrun$(EXE): prims.$(O) libcamlrun.$(A)
$(call MAKE_OCAMLRUN,$@,$^ $(call SYSLIB,ws2_32) $(EXTRALIBS))

This comment has been minimized.

@adrien-n

adrien-n Dec 25, 2016

Contributor

Tangential to your change: I think EXTRALIBS is always empty. I don't know if there are actual users of it (who might provide a non-empty value themselves).

@adrien-n

adrien-n Dec 25, 2016

Contributor

Tangential to your change: I think EXTRALIBS is always empty. I don't know if there are actual users of it (who might provide a non-empty value themselves).

ocamlrund$(EXE): libcamlrund.$(A) prims.$(O) main.$(O)
$(MKEXE) -o ocamlrund$(EXE) prims.$(O) \
$(call SYSLIB,ws2_32) $(EXTRALIBS) libcamlrund.$(A)
ocamlrund$(EXE): prims.$(O) libcamlrund.$(A)
$(MKEXE) -o $@ $^ $(call SYSLIB,ws2_32) $(EXTRALIBS)
.depend.nt: .depend
rm -f .depend.win32
ProTip! Use n and p to navigate between commits in a pull request.