diff options
| author | Sébastien Hinderer <Sebastien.Hinderer@inria.fr> | 2016-09-13 17:59:47 +0200 |
|---|---|---|
| committer | Alain Frisch <alain@frisch.fr> | 2016-09-13 17:59:47 +0200 |
| commit | 5c4c41ba10639fbaad61dc747afc965c8348d01e (patch) | |
| tree | aa507e5c3a66bfef4d158109fa4d92bad42d7d77 /config | |
| parent | b28148defc741e1191a666204a03a01dac793565 (diff) | |
| download | ocaml-5c4c41ba10639fbaad61dc747afc965c8348d01e.tar.gz | |
Merge makefiles in otherlibs/systhreads (#785)
* Make sure the PTHREAD_CAML_LINK variable is defined everywhere.
* Merge makefiles in otherlibs/systhreads
Before this commit, the .cma and .cmxa libraries were linked using -linkall
under Windows but not under Unix.
It was not possible to clarify why -linkall was useful, but given the small
size of the involved modules and the fact that, for most modules, it
does not seem to make much sense to use one without the others, it has been
decided to use -linkall everywhere.
This commit also stops building the .cmxs shared library under Windows, for
consistency reasons (it was built only under Windows before).
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.mingw | 1 | ||||
| -rw-r--r-- | config/Makefile.mingw64 | 1 | ||||
| -rw-r--r-- | config/Makefile.msvc | 1 | ||||
| -rw-r--r-- | config/Makefile.msvc64 | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/config/Makefile.mingw b/config/Makefile.mingw index 6ae455b087..373593aced 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -63,6 +63,7 @@ EXT_ASM=.$(S) MANEXT=1 HASHBANGSCRIPTS=false PTHREAD_LINK= +PTHREAD_CAML_LINK= X11_INCLUDES= X11_LINK= BYTECCRPATH= diff --git a/config/Makefile.mingw64 b/config/Makefile.mingw64 index dc8bc966a0..a4f6e476e9 100644 --- a/config/Makefile.mingw64 +++ b/config/Makefile.mingw64 @@ -63,6 +63,7 @@ EXT_ASM=.$(S) MANEXT=1 HASHBANGSCRIPTS=false PTHREAD_LINK= +PTHREAD_CAML_LINK= X11_INCLUDES= X11_LINK= BYTECCRPATH= diff --git a/config/Makefile.msvc b/config/Makefile.msvc index 9e6936cfb0..b3548cf5b8 100644 --- a/config/Makefile.msvc +++ b/config/Makefile.msvc @@ -58,6 +58,7 @@ EXT_ASM=.$(S) MANEXT=1 HASHBANGSCRIPTS=false PTHREAD_LINK= +PTHREAD_CAML_LINK= X11_INCLUDES= X11_LINK= BYTECCRPATH= diff --git a/config/Makefile.msvc64 b/config/Makefile.msvc64 index 7db7f4f057..7d7b883af5 100644 --- a/config/Makefile.msvc64 +++ b/config/Makefile.msvc64 @@ -58,6 +58,7 @@ EXT_ASM=.$(S) MANEXT=1 HASHBANGSCRIPTS=false PTHREAD_LINK= +PTHREAD_CAML_LINK= X11_INCLUDES= X11_LINK= BYTECCRPATH= |