diff options
| author | Gabriel Scherer <gabriel.scherer@gmail.com> | 2013-07-28 21:08:13 +0000 |
|---|---|---|
| committer | Gabriel Scherer <gabriel.scherer@gmail.com> | 2013-07-28 21:08:13 +0000 |
| commit | 82c3d8624de9d61bf38cd3d7e90c9f74f3a6ae88 (patch) | |
| tree | 9f99bd006c4026d9e1405b707ca72d77b05b1da3 /Makefile.nt | |
| parent | 20efc0fc80d471c0b1cef942d10a929d954835b3 (diff) | |
| download | ocaml-82c3d8624de9d61bf38cd3d7e90c9f74f3a6ae88.tar.gz | |
build: fix build on Windows (patch and commit message by Adrien Nader).
CI failures and further testing made me find four more issues:
- forgot to rename a variable from "OCAMLDOC" to "WITH_OCAMLDOC"
(this issue was also in the non-.nt Makefile)
- syntax error in the installopt rule: missing "fi"
- testsuite doesn't have Makefile.nt so don't use -f Makefile.nt for the
"clean" rule
- had put an extra call to make "ocamltoolsopt" which in turn built the
"opt" rule in tools/ but which isn't buildable because it is used to
build profiling.cmx which, afaiu, is not available on windows (iirc it
uses posix signals to "sample" the running application).
That issue was only triggered when building "opt" and not "world.opt"
and this is why I hadn't noticed it.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13947 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'Makefile.nt')
| -rw-r--r-- | Makefile.nt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.nt b/Makefile.nt index 192216bec2..c46942ed8f 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -204,7 +204,6 @@ opt-core: opt: $(MAKE) -f Makefile.nt opt-core $(MAKE) -f Makefile.nt otherlibrariesopt - $(MAKE) -f Makefile.nt ocamltoolsopt if test -n "$(WITH_OCAMLBUILD)"; then \ $(MAKE) -f Makefile.nt ocamlbuildlib.native; else :; fi @@ -259,7 +258,7 @@ installopt: cd stdlib ; $(MAKEREC) installopt cp asmcomp/*.cmi driver/*.cmi $(COMPLIBDIR) cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(COMPLIBDIR) - if test -n "$(OCAMLDOC)"; then (cd ocamldoc; $(MAKEREC) installopt); \ + if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKEREC) installopt); fi for i in $(OTHERLIBRARIES); do $(MAKEREC) -C otherlibs/$$i installopt; done if test -f ocamlopt.opt ; then $(MAKEREC) installoptopt; fi @@ -684,7 +683,7 @@ partialclean:: # Make clean in the test suite clean:: - cd testsuite; $(MAKE) -f Makefile.nt clean + cd testsuite; $(MAKE) clean # Default rules |