diff options
| author | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2017-08-20 11:34:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-20 11:34:16 +0200 |
| commit | ee12b8b64abe6073ad2bc33dd528d3e11fee74bd (patch) | |
| tree | b3df04297bdbd78b6a4f918ccbc591f67b54926b | |
| parent | 3de0115bfec4c217f2ee837f5a838ad82d2148da (diff) | |
| parent | e4e7fffa61b8e684c44a6681f03aae05ca99dd9e (diff) | |
| download | ocaml-ee12b8b64abe6073ad2bc33dd528d3e11fee74bd.tar.gz | |
Merge pull request #1297 from dra27/remove-windows-num
Fix Windows config/Makefile to remove num library
| -rw-r--r-- | config/Makefile.mingw | 6 | ||||
| -rw-r--r-- | config/Makefile.mingw64 | 6 | ||||
| -rw-r--r-- | config/Makefile.msvc | 6 | ||||
| -rw-r--r-- | config/Makefile.msvc64 | 6 |
4 files changed, 4 insertions, 20 deletions
diff --git a/config/Makefile.mingw b/config/Makefile.mingw index 7ee6c352b6..ca176ce106 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -185,11 +185,7 @@ PACKLD=$(TOOLPREF)ld -r -o # must have a space after '-o' ############# Configuration for the contributed libraries -OTHERLIBRARIES=win32unix str num win32graph dynlink bigarray systhreads - -### Name of the target architecture for the "num" library -BNG_ARCH=ia32 -BNG_ASM_LEVEL=1 +OTHERLIBRARIES=win32unix str win32graph dynlink bigarray systhreads ############# for the testsuite makefiles #ml let topdir = "" and wintopdir = "";; diff --git a/config/Makefile.mingw64 b/config/Makefile.mingw64 index bed9a88338..2d81727815 100644 --- a/config/Makefile.mingw64 +++ b/config/Makefile.mingw64 @@ -185,11 +185,7 @@ PACKLD=$(TOOLPREF)ld -r -o # must have a space after '-o' ############# Configuration for the contributed libraries -OTHERLIBRARIES=win32unix str num win32graph dynlink bigarray systhreads - -### Name of the target architecture for the "num" library -BNG_ARCH=amd64 -BNG_ASM_LEVEL=1 +OTHERLIBRARIES=win32unix str win32graph dynlink bigarray systhreads ############# for the testsuite makefiles #ml let topdir = "" and wintopdir = "";; diff --git a/config/Makefile.msvc b/config/Makefile.msvc index daf6f96278..fb0c17947d 100644 --- a/config/Makefile.msvc +++ b/config/Makefile.msvc @@ -187,11 +187,7 @@ WITH_OCAMLDOC=ocamldoc ############# Configuration for the contributed libraries -OTHERLIBRARIES=win32unix systhreads str num win32graph dynlink bigarray - -### Name of the target architecture for the "num" library -BNG_ARCH=generic -BNG_ASM_LEVEL=0 +OTHERLIBRARIES=win32unix systhreads str win32graph dynlink bigarray ############# for the testsuite makefiles #ml let topdir = "" and wintopdir = "";; diff --git a/config/Makefile.msvc64 b/config/Makefile.msvc64 index d49c33f1ec..defd690fbb 100644 --- a/config/Makefile.msvc64 +++ b/config/Makefile.msvc64 @@ -190,11 +190,7 @@ WITH_OCAMLDOC=ocamldoc ############# Configuration for the contributed libraries -OTHERLIBRARIES=win32unix systhreads str num win32graph dynlink bigarray - -### Name of the target architecture for the "num" library -BNG_ARCH=generic -BNG_ASM_LEVEL=0 +OTHERLIBRARIES=win32unix systhreads str win32graph dynlink bigarray ############# for the testsuite makefiles #ml let topdir = "" and wintopdir = "";; |