diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2020-08-12 19:43:05 +0100 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@college-de-france.fr> | 2020-10-30 11:27:43 +0100 |
| commit | 370f2b29b26d4b12b09dfbf62c6873c7307c3947 (patch) | |
| tree | b3859966a0e0ad239143dabab7458dedef67b55a /otherlibs | |
| parent | 3e92b69aee510e4ee6f93f6f49650b5f97aa1c2e (diff) | |
| download | ocaml-370f2b29b26d4b12b09dfbf62c6873c7307c3947.tar.gz | |
Merge pull request #9840 from dra27/fix-9839
Partial revert of 9165: don't build the compiler with -O3 in flambda
(cherry picked from commit 6ce1c60ca97ee962ebf5d5218628bc388536325e)
Diffstat (limited to 'otherlibs')
| -rw-r--r-- | otherlibs/Makefile.otherlibs.common | 5 | ||||
| -rw-r--r-- | otherlibs/dynlink/Makefile | 3 | ||||
| -rw-r--r-- | otherlibs/systhreads/Makefile | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/otherlibs/Makefile.otherlibs.common b/otherlibs/Makefile.otherlibs.common index a029af5606..4e9a726c81 100644 --- a/otherlibs/Makefile.otherlibs.common +++ b/otherlibs/Makefile.otherlibs.common @@ -34,7 +34,10 @@ OC_CPPFLAGS += -I$(ROOTDIR)/runtime $(EXTRACPPFLAGS) # Compilation options COMPFLAGS=-absname -w +a-4-9-41-42-44-45-48 -warn-error A -bin-annot -g \ -safe-string -strict-sequence -strict-formats $(EXTRACAMLFLAGS) -MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlmklib$(EXE) +ifeq "$(FLAMBDA)" "true" +OPTCOMPFLAGS += -O3 +endif +MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlmklib # Variables that must be defined by individual libraries: # LIBNAME diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile index 1beacfa0b3..5c88164ac3 100644 --- a/otherlibs/dynlink/Makefile +++ b/otherlibs/dynlink/Makefile @@ -33,6 +33,9 @@ OCAMLOPT=$(BEST_OCAMLOPT) -g -nostdlib -I $(ROOTDIR)/stdlib COMPFLAGS=-strict-sequence -principal -absname -w +a-4-9-40-41-42-44-45-48-66 \ -warn-error A \ -bin-annot -safe-string -strict-formats +ifeq "$(FLAMBDA)" "true" +OPTCOMPFLAGS += -O3 +endif COMPFLAGS += -I byte OPTCOMPFLAGS += -I native diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile index 60518d2072..5ac70d7775 100644 --- a/otherlibs/systhreads/Makefile +++ b/otherlibs/systhreads/Makefile @@ -38,6 +38,9 @@ CAMLOPT=$(BEST_OCAMLOPT) $(LIBS) MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlmklib$(EXE) COMPFLAGS=-w +33..39 -warn-error A -g -bin-annot -safe-string +ifeq "$(FLAMBDA)" "true" +OPTCOMPFLAGS += -O3 +endif LIBNAME=threads |