diff options
-rwxr-xr-x | configure | 16 | ||||
-rw-r--r-- | configure.ac | 17 |
2 files changed, 17 insertions, 16 deletions
@@ -3171,7 +3171,7 @@ fi | |||
3171 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mindirect_branch_thunk" >&5 | 3171 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mindirect_branch_thunk" >&5 |
3172 | $as_echo "$ax_cv_check_cflags___mindirect_branch_thunk" >&6; } | 3172 | $as_echo "$ax_cv_check_cflags___mindirect_branch_thunk" >&6; } |
3173 | if test "x$ax_cv_check_cflags___mindirect_branch_thunk" = xyes; then : | 3173 | if test "x$ax_cv_check_cflags___mindirect_branch_thunk" = xyes; then : |
3174 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mindirect-branch=thunk" | 3174 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk" |
3175 | 3175 | ||
3176 | else | 3176 | else |
3177 | : | 3177 | : |
@@ -3207,7 +3207,7 @@ fi | |||
3207 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mretpoline" >&5 | 3207 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mretpoline" >&5 |
3208 | $as_echo "$ax_cv_check_cflags___mretpoline" >&6; } | 3208 | $as_echo "$ax_cv_check_cflags___mretpoline" >&6; } |
3209 | if test "x$ax_cv_check_cflags___mretpoline" = xyes; then : | 3209 | if test "x$ax_cv_check_cflags___mretpoline" = xyes; then : |
3210 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mretpoline" | 3210 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline" |
3211 | 3211 | ||
3212 | else | 3212 | else |
3213 | : | 3213 | : |
@@ -3243,7 +3243,7 @@ fi | |||
3243 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_clash_protection" >&5 | 3243 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_clash_protection" >&5 |
3244 | $as_echo "$ax_cv_check_cflags___fstack_clash_protection" >&6; } | 3244 | $as_echo "$ax_cv_check_cflags___fstack_clash_protection" >&6; } |
3245 | if test "x$ax_cv_check_cflags___fstack_clash_protection" = xyes; then : | 3245 | if test "x$ax_cv_check_cflags___fstack_clash_protection" = xyes; then : |
3246 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-clash-protection" | 3246 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection" |
3247 | 3247 | ||
3248 | else | 3248 | else |
3249 | : | 3249 | : |
@@ -3279,7 +3279,7 @@ fi | |||
3279 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_protector_strong" >&5 | 3279 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_protector_strong" >&5 |
3280 | $as_echo "$ax_cv_check_cflags___fstack_protector_strong" >&6; } | 3280 | $as_echo "$ax_cv_check_cflags___fstack_protector_strong" >&6; } |
3281 | if test "x$ax_cv_check_cflags___fstack_protector_strong" = xyes; then : | 3281 | if test "x$ax_cv_check_cflags___fstack_protector_strong" = xyes; then : |
3282 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-protector-strong" | 3282 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong" |
3283 | 3283 | ||
3284 | else | 3284 | else |
3285 | : | 3285 | : |
@@ -3293,7 +3293,7 @@ fi | |||
3293 | 3293 | ||
3294 | if test "x$enable_analyzer" = "xyes"; then : | 3294 | if test "x$enable_analyzer" = "xyes"; then : |
3295 | 3295 | ||
3296 | EXTRA_CFLAGS+=" -fanalyzer" | 3296 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fanalyzer" |
3297 | 3297 | ||
3298 | fi | 3298 | fi |
3299 | 3299 | ||
@@ -3515,7 +3515,7 @@ else | |||
3515 | AA_LIBS=$pkg_cv_AA_LIBS | 3515 | AA_LIBS=$pkg_cv_AA_LIBS |
3516 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 3516 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3517 | $as_echo "yes" >&6; } | 3517 | $as_echo "yes" >&6; } |
3518 | EXTRA_CFLAGS+=" $AA_CFLAGS" && EXTRA_LDFLAGS+=" $AA_LIBS" | 3518 | EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS" |
3519 | fi | 3519 | fi |
3520 | 3520 | ||
3521 | 3521 | ||
@@ -3530,7 +3530,7 @@ fi | |||
3530 | if test "x$enable_selinux" = "xyes"; then : | 3530 | if test "x$enable_selinux" = "xyes"; then : |
3531 | 3531 | ||
3532 | HAVE_SELINUX="-DHAVE_SELINUX" | 3532 | HAVE_SELINUX="-DHAVE_SELINUX" |
3533 | EXTRA_LDFLAGS+=" -lselinux " | 3533 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux " |
3534 | 3534 | ||
3535 | 3535 | ||
3536 | fi | 3536 | fi |
@@ -3810,7 +3810,7 @@ fi | |||
3810 | if test "x$enable_gcov" = "xyes"; then : | 3810 | if test "x$enable_gcov" = "xyes"; then : |
3811 | 3811 | ||
3812 | HAVE_GCOV="--coverage -DHAVE_GCOV " | 3812 | HAVE_GCOV="--coverage -DHAVE_GCOV " |
3813 | EXTRA_LDFLAGS+=" -lgcov --coverage " | 3813 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage " |
3814 | 3814 | ||
3815 | 3815 | ||
3816 | fi | 3816 | fi |
diff --git a/configure.ac b/configure.ac index 036b62484..606f4ef7e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -24,25 +24,25 @@ AC_PROG_RANLIB | |||
24 | HAVE_SPECTRE="no" | 24 | HAVE_SPECTRE="no" |
25 | AX_CHECK_COMPILE_FLAG( | 25 | AX_CHECK_COMPILE_FLAG( |
26 | [-mindirect-branch=thunk], | 26 | [-mindirect-branch=thunk], |
27 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mindirect-branch=thunk"] | 27 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk"] |
28 | ) | 28 | ) |
29 | AX_CHECK_COMPILE_FLAG( | 29 | AX_CHECK_COMPILE_FLAG( |
30 | [-mretpoline], | 30 | [-mretpoline], |
31 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mretpoline"] | 31 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline"] |
32 | ) | 32 | ) |
33 | AX_CHECK_COMPILE_FLAG( | 33 | AX_CHECK_COMPILE_FLAG( |
34 | [-fstack-clash-protection], | 34 | [-fstack-clash-protection], |
35 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-clash-protection"] | 35 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection"] |
36 | ) | 36 | ) |
37 | AX_CHECK_COMPILE_FLAG( | 37 | AX_CHECK_COMPILE_FLAG( |
38 | [-fstack-protector-strong], | 38 | [-fstack-protector-strong], |
39 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-protector-strong"] | 39 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong"] |
40 | ) | 40 | ) |
41 | 41 | ||
42 | AC_ARG_ENABLE([analyzer], | 42 | AC_ARG_ENABLE([analyzer], |
43 | AS_HELP_STRING([--enable-analyzer], [enable GCC 10 static analyzer])) | 43 | AS_HELP_STRING([--enable-analyzer], [enable GCC 10 static analyzer])) |
44 | AS_IF([test "x$enable_analyzer" = "xyes"], [ | 44 | AS_IF([test "x$enable_analyzer" = "xyes"], [ |
45 | EXTRA_CFLAGS+=" -fanalyzer" | 45 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fanalyzer" |
46 | ]) | 46 | ]) |
47 | 47 | ||
48 | HAVE_APPARMOR="" | 48 | HAVE_APPARMOR="" |
@@ -50,7 +50,8 @@ AC_ARG_ENABLE([apparmor], | |||
50 | AS_HELP_STRING([--enable-apparmor], [enable apparmor])) | 50 | AS_HELP_STRING([--enable-apparmor], [enable apparmor])) |
51 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 51 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
52 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 52 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
53 | PKG_CHECK_MODULES([AA], libapparmor, [EXTRA_CFLAGS+=" $AA_CFLAGS" && EXTRA_LDFLAGS+=" $AA_LIBS"]) | 53 | PKG_CHECK_MODULES([AA], libapparmor, |
54 | [EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"]) | ||
54 | AC_SUBST(HAVE_APPARMOR) | 55 | AC_SUBST(HAVE_APPARMOR) |
55 | ]) | 56 | ]) |
56 | 57 | ||
@@ -59,7 +60,7 @@ AC_ARG_ENABLE([selinux], | |||
59 | AS_HELP_STRING([--enable-selinux], [SELinux labeling support])) | 60 | AS_HELP_STRING([--enable-selinux], [SELinux labeling support])) |
60 | AS_IF([test "x$enable_selinux" = "xyes"], [ | 61 | AS_IF([test "x$enable_selinux" = "xyes"], [ |
61 | HAVE_SELINUX="-DHAVE_SELINUX" | 62 | HAVE_SELINUX="-DHAVE_SELINUX" |
62 | EXTRA_LDFLAGS+=" -lselinux " | 63 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux " |
63 | AC_SUBST(HAVE_SELINUX) | 64 | AC_SUBST(HAVE_SELINUX) |
64 | ]) | 65 | ]) |
65 | 66 | ||
@@ -215,7 +216,7 @@ AC_ARG_ENABLE([gcov], | |||
215 | AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])) | 216 | AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])) |
216 | AS_IF([test "x$enable_gcov" = "xyes"], [ | 217 | AS_IF([test "x$enable_gcov" = "xyes"], [ |
217 | HAVE_GCOV="--coverage -DHAVE_GCOV " | 218 | HAVE_GCOV="--coverage -DHAVE_GCOV " |
218 | EXTRA_LDFLAGS+=" -lgcov --coverage " | 219 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage " |
219 | AC_SUBST(HAVE_GCOV) | 220 | AC_SUBST(HAVE_GCOV) |
220 | ]) | 221 | ]) |
221 | 222 | ||