summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Frisch <alain@frisch.fr>2012-03-23 15:14:02 +0000
committerAlain Frisch <alain@frisch.fr>2012-03-23 15:14:02 +0000
commit05fbe3cbdeb2297e044e8f4b42335959dd4e19a1 (patch)
tree4ade7d5ddfd1c726707aa9dde04e867d7b02d28c
parent90fde3e40e13e0fbcd90e72ca43f481278566d60 (diff)
Use new -stack option from flexdll 0.28 (#5465).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12263 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--README.win324
-rw-r--r--config/Makefile.mingw2
-rw-r--r--config/Makefile.mingw642
-rw-r--r--config/Makefile.msvc4
-rw-r--r--config/Makefile.msvc644
5 files changed, 8 insertions, 8 deletions
diff --git a/README.win32 b/README.win32
index 78d32c804..7a1356ee6 100644
--- a/README.win32
+++ b/README.win32
@@ -87,7 +87,7 @@ THIRD-PARTY SOFTWARE:
http://www.microsoft.com/downloads/en/default.aspx
under the name "Microsoft Windows 7 SDK".
-[2] flexdll version 0.26 or later.
+[2] flexdll version 0.28 or later.
Can be downloaded from http://alain.frisch.fr/flexdll.html
[3] TCL/TK version 8.5. Windows binaries are available as part of the
@@ -366,7 +366,7 @@ THIRD-PARTY SOFTWARE:
http://www.microsoft.com/downloads/en/default.aspx
under the name "Microsoft Windows 7 SDK".
-[2] flexdll version 0.27 or later.
+[2] flexdll version 0.28 or later.
Can be downloaded from http://alain.frisch.fr/flexdll.html
diff --git a/config/Makefile.mingw b/config/Makefile.mingw
index 0aea48ceb..29d14f6e6 100644
--- a/config/Makefile.mingw
+++ b/config/Makefile.mingw
@@ -101,7 +101,7 @@ NATIVECCLIBS=-lws2_32
CPP=$(BYTECC) -E
### Flexlink
-FLEXLINK=flexlink -chain mingw
+FLEXLINK=flexlink -chain mingw -stack 16777216
FLEXDIR=$(shell $(FLEXLINK) -where)
IFLEXDIR=-I"$(FLEXDIR)"
MKDLL=$(FLEXLINK)
diff --git a/config/Makefile.mingw64 b/config/Makefile.mingw64
index d4a056411..86dd90a06 100644
--- a/config/Makefile.mingw64
+++ b/config/Makefile.mingw64
@@ -101,7 +101,7 @@ NATIVECCLIBS=-lws2_32
CPP=$(BYTECC) -E
### Flexlink
-FLEXLINK=flexlink -chain mingw64
+FLEXLINK=flexlink -chain mingw64 -stack 33554432
FLEXDIR=$(shell $(FLEXLINK) -where)
IFLEXDIR=-I"$(FLEXDIR)"
MKDLL=$(FLEXLINK)
diff --git a/config/Makefile.msvc b/config/Makefile.msvc
index 3a520e8fe..ff96ea27d 100644
--- a/config/Makefile.msvc
+++ b/config/Makefile.msvc
@@ -95,11 +95,11 @@ NATIVECCLIBS=advapi32.lib ws2_32.lib
CPP=cl /nologo /EP
### Flexlink
-FLEXLINK=flexlink -merge-manifest
+FLEXLINK=flexlink -merge-manifest -stack 16777216
FLEXDIR=$(shell $(FLEXLINK) -where)
IFLEXDIR=-I"$(FLEXDIR)"
MKDLL=$(FLEXLINK)
-MKEXE=$(FLEXLINK) -exe -link /STACK:16777216
+MKEXE=$(FLEXLINK) -exe
MKMAINDLL=$(FLEXLINK) -maindll
### How to build a static library
diff --git a/config/Makefile.msvc64 b/config/Makefile.msvc64
index 2b3edcd56..b6c2c6bc1 100644
--- a/config/Makefile.msvc64
+++ b/config/Makefile.msvc64
@@ -100,11 +100,11 @@ NATIVECCLIBS=advapi32.lib ws2_32.lib $(EXTRALIBS)
CPP=cl /nologo /EP
### Flexlink
-FLEXLINK=flexlink -x64 -merge-manifest
+FLEXLINK=flexlink -x64 -merge-manifest -stack 33554432
FLEXDIR=$(shell $(FLEXLINK) -where)
IFLEXDIR=-I"$(FLEXDIR)"
MKDLL=$(FLEXLINK)
-MKEXE=$(FLEXLINK) -exe -link /STACK:33554432
+MKEXE=$(FLEXLINK) -exe
MKMAINDLL=$(FLEXLINK) -maindll
### How to build a static library