You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
2.2 KiB
68 lines
2.2 KiB
4 years ago
|
From 56cc4110e1ef0667ff248a689c50803c2ec4312b Mon Sep 17 00:00:00 2001
|
||
5 years ago
|
From: Alon Bar-Lev <alon.barlev@gmail.com>
|
||
|
Date: Fri, 31 May 2019 02:30:37 +0300
|
||
4 years ago
|
Subject: [PATCH 2/3] build: add --disable-defaultflags
|
||
5 years ago
|
|
||
|
Align with tpm2-tss to allow downstream to provide flags.
|
||
|
|
||
|
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
|
||
|
---
|
||
4 years ago
|
configure.ac | 41 ++++++++++++++++++++++++-----------------
|
||
|
1 file changed, 24 insertions(+), 17 deletions(-)
|
||
5 years ago
|
|
||
|
diff --git a/configure.ac b/configure.ac
|
||
4 years ago
|
index d14c4d7..3ee45c5 100644
|
||
5 years ago
|
--- a/configure.ac
|
||
|
+++ b/configure.ac
|
||
4 years ago
|
@@ -84,23 +84,30 @@ AC_ARG_ENABLE([tctienvvar],
|
||
5 years ago
|
|
||
|
AC_CONFIG_FILES([Makefile])
|
||
|
|
||
|
-AX_ADD_COMPILER_FLAG([-std=c99])
|
||
|
-AX_ADD_COMPILER_FLAG([-Wall])
|
||
|
-AX_ADD_COMPILER_FLAG([-Wextra])
|
||
|
-AX_ADD_COMPILER_FLAG([-Wformat-security])
|
||
|
-AX_ADD_COMPILER_FLAG([-Werror])
|
||
|
-AX_ADD_COMPILER_FLAG([-fstack-protector-all])
|
||
|
-AX_ADD_COMPILER_FLAG([-fpic])
|
||
|
-AX_ADD_COMPILER_FLAG([-fPIC])
|
||
|
-
|
||
|
-# work around GCC bug #53119
|
||
|
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
|
||
|
-AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
|
||
|
-
|
||
|
-AX_ADD_LINK_FLAG([-Wl,--no-undefined])
|
||
|
-AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
|
||
|
-AX_ADD_LINK_FLAG([-Wl,-z,now])
|
||
|
-AX_ADD_LINK_FLAG([-Wl,-z,relro])
|
||
|
+AC_ARG_ENABLE([defaultflags],
|
||
|
+ [AS_HELP_STRING([--disable-defaultflags],
|
||
4 years ago
|
+ [Disable default preprocessor, compiler, and linker flags.])],,
|
||
5 years ago
|
+ [enable_defaultflags=yes])
|
||
|
+AS_IF([test "x$enable_defaultflags" = "xyes"],
|
||
|
+ [
|
||
|
+ AX_ADD_COMPILER_FLAG([-std=c99])
|
||
|
+ AX_ADD_COMPILER_FLAG([-Wall])
|
||
|
+ AX_ADD_COMPILER_FLAG([-Wextra])
|
||
|
+ AX_ADD_COMPILER_FLAG([-Wformat-security])
|
||
|
+ AX_ADD_COMPILER_FLAG([-Werror])
|
||
|
+ AX_ADD_COMPILER_FLAG([-fstack-protector-all])
|
||
|
+ AX_ADD_COMPILER_FLAG([-fpic])
|
||
|
+ AX_ADD_COMPILER_FLAG([-fPIC])
|
||
|
+
|
||
|
+ # work around GCC bug #53119
|
||
|
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
|
||
|
+ AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
|
||
|
+
|
||
|
+ AX_ADD_LINK_FLAG([-Wl,--no-undefined])
|
||
|
+ AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
|
||
|
+ AX_ADD_LINK_FLAG([-Wl,-z,now])
|
||
|
+ AX_ADD_LINK_FLAG([-Wl,-z,relro])
|
||
|
+ ])
|
||
|
|
||
|
AX_CODE_COVERAGE
|
||
|
m4_ifdef([_AX_CODE_COVERAGE_RULES],
|
||
|
--
|
||
4 years ago
|
2.24.1
|
||
5 years ago
|
|