From a5ede3b311e5218b2b19663202552b42647b7deb Mon Sep 17 00:00:00 2001
From: Michael Tuexen <tuexen@fh-muenster.de>
Date: Fri, 4 May 2018 13:37:11 +0200
Subject: [PATCH] Refactor CFLAGS handling to allow non clang/gcc compilers.
The Solaris Studio compiler uses different flags...
---
gtests/net/packetdrill/Makefile.Darwin | 2 +-
gtests/net/packetdrill/Makefile.FreeBSD | 1 +
gtests/net/packetdrill/Makefile.Linux | 1 +
gtests/net/packetdrill/Makefile.NetBSD | 1 +
gtests/net/packetdrill/Makefile.OpenBSD | 1 +
gtests/net/packetdrill/Makefile.common | 4 ++--
6 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gtests/net/packetdrill/Makefile.Darwin b/gtests/net/packetdrill/Makefile.Darwin
index 908b2770..76955dbe 100644
--- a/gtests/net/packetdrill/Makefile.Darwin
+++ b/gtests/net/packetdrill/Makefile.Darwin
@@ -1,5 +1,5 @@
packetdrill-ext-libs := -lpcap
-CFLAGS = -D__APPLE_USE_RFC_3542
+CFLAGS = -D__APPLE_USE_RFC_3542 -Wall -Werror -Wno-unknown-warning-option -Wno-address-of-packed-member
LDFLAGS =
ifneq ("$(wildcard /usr/lib/libsctp.dylib)","")
packetdrill-ext-libs += -lsctp
diff --git a/gtests/net/packetdrill/Makefile.FreeBSD b/gtests/net/packetdrill/Makefile.FreeBSD
index 079bb0c2..729edad2 100644
--- a/gtests/net/packetdrill/Makefile.FreeBSD
+++ b/gtests/net/packetdrill/Makefile.FreeBSD
@@ -1,2 +1,3 @@
packetdrill-ext-libs := -lprocstat -lutil -lkvm -lelf -lpthread -lpcap
+CFLAGS = -Wall -Werror -Wno-unknown-warning-option -Wno-address-of-packed-member
.include "Makefile.common"
diff --git a/gtests/net/packetdrill/Makefile.Linux b/gtests/net/packetdrill/Makefile.Linux
index 2310254b..5cfef502 100644
--- a/gtests/net/packetdrill/Makefile.Linux
+++ b/gtests/net/packetdrill/Makefile.Linux
@@ -1,2 +1,3 @@
packetdrill-ext-libs := -lpthread -lrt -ldl -lsctp -static
+CFLAGS = -Wall -Werror -Wno-unknown-warning-option -Wno-address-of-packed-member
include Makefile.common
diff --git a/gtests/net/packetdrill/Makefile.NetBSD b/gtests/net/packetdrill/Makefile.NetBSD
index a32f8271..4898687c 100644
--- a/gtests/net/packetdrill/Makefile.NetBSD
+++ b/gtests/net/packetdrill/Makefile.NetBSD
@@ -1,2 +1,3 @@
packetdrill-ext-libs := -lpthread -lpcap
+CFLAGS = -Wall -Werror -Wno-unknown-warning-option -Wno-address-of-packed-member
.include "Makefile.common"
diff --git a/gtests/net/packetdrill/Makefile.OpenBSD b/gtests/net/packetdrill/Makefile.OpenBSD
index a32f8271..4898687c 100644
--- a/gtests/net/packetdrill/Makefile.OpenBSD
+++ b/gtests/net/packetdrill/Makefile.OpenBSD
@@ -1,2 +1,3 @@
packetdrill-ext-libs := -lpthread -lpcap
+CFLAGS = -Wall -Werror -Wno-unknown-warning-option -Wno-address-of-packed-member
.include "Makefile.common"
diff --git a/gtests/net/packetdrill/Makefile.common b/gtests/net/packetdrill/Makefile.common
index c019a4c3..ced71661 100644
--- a/gtests/net/packetdrill/Makefile.common
+++ b/gtests/net/packetdrill/Makefile.common
@@ -1,6 +1,6 @@
all: binaries
-CFLAGS += -g -Wall -Werror -Wno-unknown-warning-option -Wno-address-of-packed-member
+CFLAGS += -g
parser.o: parser.y
bison --output=parser.c --defines=parser.h --report=state parser.y
@@ -8,7 +8,7 @@ parser.o: parser.y
lexer.o: lexer.l parser.o
flex -olexer.c lexer.l
- $(CC) -O2 -g -Wall -Wno-unknown-warning-option -Wno-address-of-packed-member -c lexer.c
+ $(CC) -O2 $(CFLAGS) -c lexer.c
packetdrill-lib := \
checksum.o code.o config.o hash.o hash_map.o ip_address.o ip_prefix.o \
--
GitLab