From 27beb944ff6ff18ea612c116e414eb40ce1320a6 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@college-de-france.fr>
Date: Sat, 14 Nov 2020 10:09:34 +0100
Subject: Do not use -warn-error when building from a release tarball

Stopping on warnings is useful for development builds, but unhelpful
for released software.
---
 Makefile.extr | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'Makefile.extr')

diff --git a/Makefile.extr b/Makefile.extr
index b417945b..23e01614 100644
--- a/Makefile.extr
+++ b/Makefile.extr
@@ -50,13 +50,20 @@ INCLUDES=$(patsubst %,-I %, $(DIRS))
 
 # Control of warnings:
 
-WARNINGS=-w +a-4-9-27 -strict-sequence -safe-string -warn-error +a #Deprication returns with ocaml 4.03
+WARNINGS=-w +a-4-9-27
 extraction/%.cmx: WARNINGS +=-w -20-27-32..34-39-41-44..45-60-67
 extraction/%.cmo: WARNINGS +=-w -20-27-32..34-39-41-44..45-60-67
 cparser/pre_parser.cmx: WARNINGS += -w -41
 cparser/pre_parser.cmo: WARNINGS += -w -41
 
-COMPFLAGS+=-g $(INCLUDES) -I "$(MENHIR_DIR)" $(WARNINGS)
+# Turn warnings into errors, but not for released tarballs
+ifeq ($(wildcard .git),.git)
+WARN_ERRORS=-warn-error +a
+else
+WARN_ERRORS=
+endif
+
+COMPFLAGS+=-g -strict-sequence -safe-string $(INCLUDES) -I "$(MENHIR_DIR)" $(WARNINGS) $(WARN_ERRORS)
 
 # Using .opt compilers if available
 
-- 
cgit