summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Scherer <gabriel.scherer@gmail.com>2014-08-06 11:58:03 +0000
committerGabriel Scherer <gabriel.scherer@gmail.com>2014-08-06 11:58:03 +0000
commit43f47d2f5db67e0585c6dd7c5ff3234a66f843ce (patch)
tree175297dbb166010a4bd84292c017d5721fdac517
parentd59a10413fe17b017e5df2e1611c561a9341527e (diff)
PR#6509: Add -linkall flag to ocamlcommon archives (Patch by Frédéric Bour)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15047 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--Changes2
-rw-r--r--Makefile4
2 files changed, 4 insertions, 2 deletions
diff --git a/Changes b/Changes
index d6d8ad88a..6d5672cdb 100644
--- a/Changes
+++ b/Changes
@@ -249,6 +249,8 @@ Bug fixes:
(Leo White)
- PR#6482: ocamlbuild fails when _tags file in unhygienic directory
(Gabriel Scherer)
+- PR#6509: add -linkall flag to ocamlcommon.cma
+ (Frédéric Bour)
- fix -dsource printing of "external _pipe = ..."
(Gabriel Scherer)
- bound-checking bug in caml_string_{get,set}{16,32,64}
diff --git a/Makefile b/Makefile
index e552ede5b..733ed99d4 100644
--- a/Makefile
+++ b/Makefile
@@ -372,7 +372,7 @@ clean:: partialclean
# Shared parts of the system
compilerlibs/ocamlcommon.cma: $(COMMON)
- $(CAMLC) -a -o $@ $(COMMON)
+ $(CAMLC) -a -linkall -o $@ $(COMMON)
partialclean::
rm -f compilerlibs/ocamlcommon.cma
@@ -491,7 +491,7 @@ beforedepend:: parsing/lexer.ml
# Shared parts of the system compiled with the native-code compiler
compilerlibs/ocamlcommon.cmxa: $(COMMON:.cmo=.cmx)
- $(CAMLOPT) -a -o $@ $(COMMON:.cmo=.cmx)
+ $(CAMLOPT) -a -linkall -o $@ $(COMMON:.cmo=.cmx)
partialclean::
rm -f compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a