diff options
| author | Wojciech Meyer <wojciech.meyer@gmail.com> | 2013-07-01 19:28:15 +0000 |
|---|---|---|
| committer | Wojciech Meyer <wojciech.meyer@gmail.com> | 2013-07-01 19:28:15 +0000 |
| commit | 65e05320e34ba47432d6ccc6dd5b075e9f8aceb9 (patch) | |
| tree | 19650ea07125101eac0d5a1a1e6cb93c2f3baf15 /Makefile.nt | |
| parent | 9f9c05df50c1cf562a060668575a417c69825918 (diff) | |
| download | ocaml-65e05320e34ba47432d6ccc6dd5b075e9f8aceb9.tar.gz | |
configure: store $target and $host in the build configuration (fixed).
(patch by Adrien Nader!)
Compared to the previous version of this patch, this fixes too issues.
First, it updates the makefiles for mingw and msvc to set $host and
$target. I'm not completely sure why that was required since these
variables should have evaluated to empty strings which were only tested
for equality later on. Still, it's needed and it avoids an asymetry
between the regular ./configure-based builds and the ones using pre-made
Makefiles.
Second, it update the ocamlbuild config to also store $host and $target.
I had been building the cross-compilers with OCAMLBUILD_NOBOOT (which is
rather new) and updating that config wasn't needed. However it is
required for the "regular" builds.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13862 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'Makefile.nt')
| -rw-r--r-- | Makefile.nt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.nt b/Makefile.nt index 41d9c4a8e4..822923abd7 100644 --- a/Makefile.nt +++ b/Makefile.nt @@ -363,6 +363,8 @@ utils/config.ml: utils/config.mlp config/Makefile -e 's|%%MKEXE%%|$(MKEXE)|' \ -e 's|%%MKMAINDLL%%|$(MKMAINDLL)|' \ -e 's|%%CC_PROFILE%%||' \ + -e 's|%%HOST%%|$(HOST)|' \ + -e 's|%%TARGET%%|$(TARGET)|' \ utils/config.mlp > utils/config.ml @chmod -w utils/config.ml |