diff options
| author | Wojciech Meyer <wojciech.meyer@gmail.com> | 2013-07-28 16:06:14 +0000 |
|---|---|---|
| committer | Wojciech Meyer <wojciech.meyer@gmail.com> | 2013-07-28 16:06:14 +0000 |
| commit | b5668f67ffe99313df6e38ffb1aa7e8fa2eb1a12 (patch) | |
| tree | 630c2cdf723b75d5dad5e42c2ee2cc3d69ef76e3 | |
| parent | 79bc2c2efae0badcb73bde91d6fa76af89c01473 (diff) | |
build: pass "-f Makefile.nt" to sub-make processes of Makefile.nt.
(Patch by Adrien Nader!)
The $(MAKE) variable of Makefiles doesn't include the -f flag. Pass it
explicitely.
build: pass "-f Makefile.nt" to sub-make processes of Makefile.nt.
The $(MAKE) variable of Makefiles doesn't include the -f flag. Pass it
explicitely.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13945 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | Makefile.nt | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Makefile.nt b/Makefile.nt index f18e687c0..b139d9e7a 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -197,17 +197,16 @@ cleanboot: # Compile the native-code compiler opt-core: - $(MAKE) runtimeopt - $(MAKE) ocamlopt - $(MAKE) libraryopt + $(MAKE) -f Makefile.nt runtimeopt + $(MAKE) -f Makefile.nt ocamlopt + $(MAKE) -f Makefile.nt libraryopt opt: - $(MAKE) runtimeopt - $(MAKE) ocamlopt - $(MAKE) libraryopt - $(MAKE) otherlibrariesopt - $(MAKE) ocamltoolsopt - if test -n "$(WITH_OCAMLBUILD)"; then $(MAKE) ocamlbuildlib.native; else :; fi + $(MAKE) -f Makefile.nt opt + $(MAKE) -f Makefile.nt otherlibrariesopt + $(MAKE) -f Makefile.nt ocamltoolsopt + if test -n "$(WITH_OCAMLBUILD)"; then \ + $(MAKE) -f Makefile.nt ocamlbuildlib.native; else :; fi # Native-code versions of the tools opt.opt: core opt-core ocamlc.opt all ocamlopt.opt ocamllex.opt \ @@ -345,7 +344,7 @@ ocamlnat: ocamlopt otherlibs/dynlink/dynlink.cmxa $(NATTOPOBJS:.cmo=.cmx) toplevel/opttoploop.cmx: otherlibs/dynlink/dynlink.cmxa otherlibs/dynlink/dynlink.cmxa: otherlibs/dynlink/natdynlink.ml - cd otherlibs/dynlink && $(MAKE) allopt + cd otherlibs/dynlink && $(MAKE) -f Makefile.nt allopt # The configuration file @@ -685,7 +684,7 @@ partialclean:: # Make clean in the test suite clean:: - cd testsuite; $(MAKE) clean + cd testsuite; $(MAKE) -f Makefile.nt clean # Default rules |