Skip to content

Commit aa75053

Browse files
committed
misc: re-enable -Wunused-but-set-variable
There should be other ways around this when necessary.
1 parent 7a3e2a1 commit aa75053

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif
1212

1313
ACLOCAL_AMFLAGS = -I m4
1414

15-
AM_CFLAGS = $(CWFLAGS) $(CSFLAGS)
15+
AM_CFLAGS = $(CWFLAGS)
1616
AM_CPPFLAGS = $(LIBFIDO2_CFLAGS) $(LIBCRYPTO_CFLAGS)
1717
if ENABLE_FUZZING
1818
AM_CPPFLAGS += -fsanitize=fuzzer-no-link

configure.ac

-4
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ AX_CHECK_COMPILE_FLAG([-Wnull-dereference], [CWFLAGS="$CWFLAGS -Wnull-dereferenc
113113
AX_CHECK_COMPILE_FLAG([-Wshadow], [CWFLAGS="$CWFLAGS -Wshadow"], [], [$check_extra_flags])
114114
AX_CHECK_COMPILE_FLAG([-Wpointer-arith], [CWFLAGS="$CWFLAGS -Wpointer-arith"], [], [$check_extra_flags])
115115

116-
AC_ARG_VAR([CSFLAGS], [Warning suppression flags])
117-
AX_CHECK_COMPILE_FLAG([-Wno-unused-but-set-variable], [CSFLAGS="-Wno-unused-but-set-variable"], [], [$check_extra_flags])
118-
119116
AC_CONFIG_FILES([
120117
Makefile
121118
pamu2fcfg/Makefile
@@ -177,7 +174,6 @@ AC_MSG_NOTICE([Summary of build options:
177174
Compiler: ${CC}
178175
CFLAGS: ${CFLAGS}
179176
CWFLAGS: ${CWFLAGS}
180-
CSFLAGS: ${CSFLAGS}
181177
Library types: Shared=${enable_shared}, Static=${enable_static}
182178
LIBFIDO2 CFLAGS: $LIBFIDO2_CFLAGS
183179
LIBFIDO2 LIBS: $LIBFIDO2_LIBS

fuzz/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright (C) 2020 Yubico AB - See COPYING
2-
AM_CFLAGS = $(CWFLAGS) $(CSFLAGS) -fsanitize=fuzzer
2+
AM_CFLAGS = $(CWFLAGS) -fsanitize=fuzzer
33
AM_CPPFLAGS = $(LIBFIDO2_CFLAGS) $(LIBCRYPTO_CFLAGS) -I$(srcdir)/..
44
AM_CPPFLAGS += -D SCONFDIR='"@SCONFDIR@"'
55
AM_LDFLAGS = -no-install -fsanitize=fuzzer

tests/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
AM_TESTS_ENVIRONMENT = PAM_U2F_MODULE='$(top_builddir)/.libs/pam_u2f.so'
44

5-
AM_CFLAGS = $(CWFLAGS) $(CSFLAGS)
5+
AM_CFLAGS = $(CWFLAGS)
66
AM_CPPFLAGS = -I$(srcdir)/..
77

88
AM_LDFLAGS = -no-install

0 commit comments

Comments
 (0)