Merge yacc/Makefile into the root Makefile#11243
Merged
dra27 merged 1 commit intoocaml:trunkfrom May 9, 2022
Merged
Conversation
c657875 to
e21b8b9
Compare
Member
|
The Windows build could be fixed with this diff: diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@ ifeq "$(BOOTSTRAPPING_FLEXDLL)" "false"
else
COLDSTART_DEPS = boot/ocamlruns$(EXE)
BOOT_FLEXLINK_CMD = \
- FLEXLINK_CMD="../boot/ocamlruns$(EXE) ../boot/flexlink.byte$(EXE)"
+ FLEXLINK_CMD='$$(ROOTDIR)/boot/ocamlruns$(EXE) $$(ROOTDIR)/boot/flexlink.byte$(EXE)'
endifi.e. including |
e21b8b9 to
cb29516
Compare
Contributor
Author
|
Thnaks!
I just pushed an updated version that take the suggestion into account.
I just split the assignment so that the line remains under the 80
characters.
|
cb29516 to
f652c02
Compare
dra27
approved these changes
May 9, 2022
shindere
added a commit
that referenced
this pull request
May 20, 2022
This had been forgotten in #11243
Contributor
Author
|
Just pushed 52278f6 to fix the distclean target. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR should be the first in a series whose purpose is to progresively
merge all the sub-makefiles (except those of the testsuite and manual) into
the root one.
The expected benefit is beter support for parallel/incremental builds,
both in terms of performance and, more importantly, in that more
dependencies will become visible to the same instance of make,
which should make the build system more robust and more parallel by
construction.
Given that this is already an important change, not much effort is
planned, in the series itself, to factorise rules. The only purpose
at the moment is to have everything controlled by a single Makefile.
Improving that Makefile will be addressed later.
In a way, this series acknowledgest the fact that GNU make is actually
not a modular build system and that pretending it is is just creating
more problems and pain for ourselves.