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

Always

Just for now

Viewing a subset of changes. View all

byterun/makefiles: share the rule to build ocamlrund

  • Loading branch information...
shindere committed Dec 20, 2016
commit f2b1a546b694325b43db641867fc942f494f656d
View
@@ -26,9 +26,6 @@ LIBS = $(BYTECCLIBS)
ocamlrun$(EXE): prims.$(O) libcamlrun.$(A)
$(MKEXE) $(BYTECCLINKOPTS) -o $@ $^ $(LIBS)
ocamlrund$(EXE): prims.$(O) libcamlrund.$(A)
$(MKEXE) $(MKEXEDEBUGFLAG) $(BYTECCLINKOPTS) -o $@ $^ $(LIBS)
ocamlruni$(EXE): prims.$(O) libcamlruni.$(A)
$(MKEXE) $(BYTECCLINKOPTS) -o $@ $^ $(LIBS)
View
@@ -26,9 +26,6 @@ LIBS = $(call SYSLIB,ws2_32) $(EXTRALIBS)
ocamlrun$(EXE): prims.$(O) libcamlrun.$(A)
$(call MAKE_OCAMLRUN,$@,$^ $(LIBS))
ocamlrund$(EXE): prims.$(O) libcamlrund.$(A)
$(MKEXE) -o $@ $^ $(LIBS)
.depend.nt: .depend
rm -f .depend.win32
echo "win32.o: win32.c caml/fail.h caml/compatibility.h \\"\
View
@@ -162,6 +162,9 @@ clean ::
libcamlrun.$(A): $(OBJS)
$(call MKLIB,$@, $^)

This comment has been minimized.

@adrien-n

adrien-n Dec 25, 2016

Contributor

I think you can remove the space before $^. I see where it comes in the current sources from but it's not typical for gnu make code to have a space there.

@adrien-n

adrien-n Dec 25, 2016

Contributor

I think you can remove the space before $^. I see where it comes in the current sources from but it's not typical for gnu make code to have a space there.

ocamlrund$(EXE): prims.$(O) libcamlrund.$(A)
$(MKEXE) $(MKEXEDEBUGFLAG) $(BYTECCLINKOPTS) -o $@ $^ $(LIBS)
libcamlrund.$(A): $(DOBJS)
$(call MKLIB,$@, $^)
ProTip! Use n and p to navigate between commits in a pull request.