From: Duncan Overbruck <mail@duncano.de>
Date: Sat, 14 Nov 2020 15:27:07 +0000 (+0100)
Subject: configure: respect environment and make CFLAGS
X-Git-Tag: v6.8~2
X-Git-Url: https://git.armaanb.net/?p=opendoas.git;a=commitdiff_plain;h=b3e966b7f3b921a686a7665f4b265b19c79c46f3

configure: respect environment and make CFLAGS
---

diff --git a/GNUmakefile b/GNUmakefile
index 9e524fc..9470202 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -5,9 +5,7 @@ SRCS=	parse.y doas.c env.c
 
 include config.mk
 
-CFLAGS+= -I. -Ilibopenbsd ${COPTS}
-COPTS+=	-Wall -Wextra -pedantic -O2 -D_FORTIFY_SOURCE=2
-YFLAGS=
+override CFLAGS:=-I. -Ilibopenbsd -O2 -Wall -Wextra ${OS_CFLAGS} ${CFLAGS}
 
 all: ${PROG}
 
diff --git a/configure b/configure
index 9592a30..1c5d989 100755
--- a/configure
+++ b/configure
@@ -153,7 +153,7 @@ BINGRP  ?=	${BINGRP}
 EOF
 
 [ -n "$OS_CFLAGS" ] && \
-	printf 'CFLAGS   +=	%s\n' "$OS_CFLAGS" >>$CONFIG_MK
+	printf 'OS_CFLAGS   +=	%s\n' "$OS_CFLAGS" >>$CONFIG_MK
 
 [ -n "$DEBUG" ] && \
 	printf 'CFLAGS   +=	-O0 -g\n' >>$CONFIG_MK
@@ -545,7 +545,7 @@ int main(void){return 0;}
 __attribute__((__unused__)) static void foo(void){return;}
 '
 check_func "__attribute__" "$src" || {
-	printf 'CFLAGS	+=	-DNO_ATTRIBUTE_ON_RETURN_TYPE=1\n' >>$CONFIG_MK
+	printf 'OS_CFLAGS	+=	-DNO_ATTRIBUTE_ON_RETURN_TYPE=1\n' >>$CONFIG_MK
 }
 
 auth=$(authmethod)