725d4a96c7
It's been decided to allow the Fedora 27 Mass Rebuild to take place
before OCaml 4.05.0 is added to Fedora. To avoid this package
accidentally getting included in the mass rebuild, this commit reverts
the new upstream version, and then it will be un-re-verted after the
Mass Rebuild.
This reverts commit 40c060b8ec.
29 lines
955 B
Diff
29 lines
955 B
Diff
From 5376164719c12fbad2321551425b3c46ec794817 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Thu, 3 Nov 2016 19:50:20 +0000
|
|
Subject: [PATCH 4/9] Don't rewrite -Werror.
|
|
|
|
In Fedora our CFLAGS contains -Wall -Werror=format-security.
|
|
|
|
As written, the sed phrase substitutes this with -Wall=format-security
|
|
which is bogus. Remove this rewriting completely.
|
|
---
|
|
Makefile | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index b30564d00..e8514d41e 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -409,7 +409,6 @@ utils/config.ml: utils/config.mlp config/Makefile
|
|
-e 's|%%CCOMPTYPE%%|cc|' \
|
|
-e 's|%%BYTECC%%|$(BYTECC) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)|' \
|
|
-e 's|%%NATIVECC%%|$(NATIVECC) $(NATIVECCCOMPOPTS)|' \
|
|
- -e '/c_compiler =/s| -Werror||' \
|
|
-e 's|%%PACKLD%%|$(PACKLD)|' \
|
|
-e 's|%%BYTECCLIBS%%|$(BYTECCLIBS)|' \
|
|
-e 's|%%NATIVECCLIBS%%|$(NATIVECCLIBS)|' \
|
|
--
|
|
2.13.1
|
|
|