6e309cd99e
- Add new patches (see https://www.haproxy.org/bugs/bugs-1.8.14.html) - Raise PKG_RELEASE to 2 Signed-off-by: Christian Lachner <gladiac@gmail.com>
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
commit a7e9853db925b12b1d040be8b04bafc11d84d685
|
|
Author: Willy Tarreau <w@1wt.eu>
|
|
Date: Tue Oct 16 18:11:34 2018 +0200
|
|
|
|
BUILD: Makefile: silence an option conflict warning with clang
|
|
|
|
clang complains that -fno-strict-overflow is not used when -fwrapv is
|
|
used, which breaks the build when -Werror is used. Let's introduce a
|
|
cc-opt-alt function to emit the former only then the latter is not
|
|
supported (since it implies the former).
|
|
|
|
(cherry picked from commit 0d7a2ae4f5199ec37ead6914fa24d40ec0989a4d)
|
|
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 1a971f92..6ffc1b06 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -98,6 +98,9 @@
|
|
# call it only once.
|
|
cc-opt = $(shell set -e; if $(CC) $(1) -E -xc - -o /dev/null </dev/null >&0 2>&0; then echo "$(1)"; fi;)
|
|
|
|
+# same but emits $2 if $1 is not supported
|
|
+cc-opt-alt = $(shell set -e; if $(CC) $(1) -E -xc - -o /dev/null </dev/null >&0 2>&0; then echo "$(1)"; else echo "$(2)"; fi;)
|
|
+
|
|
# Disable a warning when supported by the compiler. Don't put spaces around the
|
|
# warning! And don't use cc-opt which doesn't always report an error until
|
|
# another one is also returned.
|
|
@@ -147,8 +150,7 @@ DEBUG_CFLAGS = -g
|
|
# can do whatever it wants since it's an undefined behavior, so use -fwrapv
|
|
# to be sure we get the intended behavior.
|
|
SPEC_CFLAGS := -fno-strict-aliasing -Wdeclaration-after-statement
|
|
-SPEC_CFLAGS += $(call cc-opt,-fwrapv)
|
|
-SPEC_CFLAGS += $(call cc-opt,-fno-strict-overflow)
|
|
+SPEC_CFLAGS += $(call cc-opt-alt,-fwrapv,$(call cc-opt,-fno-strict-overflow))
|
|
SPEC_CFLAGS += $(call cc-nowarn,format-truncation)
|
|
SPEC_CFLAGS += $(call cc-nowarn,address-of-packed-member)
|
|
SPEC_CFLAGS += $(call cc-nowarn,null-dereference)
|