aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-03-22 06:05:49 -0500
committerBrent Cook <bcook@openbsd.org>2015-03-22 06:06:40 -0500
commit809fcf4ea75bd8609b608750ff301f363c18d92e (patch)
tree1d93c033bf0774db9edf4e7f9f22323792d612a3
parent4106a08da94b326b12757acd60339ee2d83421c0 (diff)
downloadportable-809fcf4ea75bd8609b608750ff301f363c18d92e.tar.gz
portable-809fcf4ea75bd8609b608750ff301f363c18d92e.tar.bz2
portable-809fcf4ea75bd8609b608750ff301f363c18d92e.zip
move clang flags adjustment next to the check, fix typo
-rw-r--r--configure.ac6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index ae1d255..9c5e188 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
90AC_MSG_RESULT([$CLANG]) 90AC_MSG_RESULT([$CLANG])
91AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Qunused-arguments]) 91AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Qunused-arguments])
92 92
93CFLAGS="$CFLAGS $CLANG_FLAGS"
94LDFLAGS="$LDFLAGS $CLANG_FLAGS"
95
93# We want to check for compiler flag support. Prior to clang v5.1, there was no 96# We want to check for compiler flag support. Prior to clang v5.1, there was no
94# way to make clang's "argument unused" warning fatal. So we invoke the 97# way to make clang's "argument unused" warning fatal. So we invoke the
95# compiler through a wrapper script that greps for this message. 98# compiler through a wrapper script that greps for this message.
@@ -206,9 +209,6 @@ __asm__(".section .note.GNU-stack,\"\",@progbits");]])],
206CFLAGS="$save_cflags $AM_CFLAGS" 209CFLAGS="$save_cflags $AM_CFLAGS"
207AM_PROG_AS 210AM_PROG_AS
208 211
209CFLAGS="$CFLAGS $CLANG_CFLAGS"
210LDFLAGS="$LDFLAGS $CLANG_FLAGS"
211
212AC_CHECK_FUNCS([arc4random_buf asprintf explicit_bzero funopen getauxval]) 212AC_CHECK_FUNCS([arc4random_buf asprintf explicit_bzero funopen getauxval])
213AC_CHECK_FUNCS([getentropy issetugid memmem poll reallocarray]) 213AC_CHECK_FUNCS([getentropy issetugid memmem poll reallocarray])
214AC_CHECK_FUNCS([strlcat strlcpy strndup strnlen strsep strtonum]) 214AC_CHECK_FUNCS([strlcat strlcpy strndup strnlen strsep strtonum])