diff options
author | netblue30 <netblue30@yahoo.com> | 2018-03-23 20:33:53 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2018-03-23 20:33:53 -0400 |
commit | 7b808e6d3f2bee32e86a42c7bb46154d7c8e1a08 (patch) | |
tree | 9822d57fb2cf29937ba808d2c6cb0b814bbcf3f4 /configure | |
parent | support Spectre mitigation patch for gcc compiler (diff) | |
download | firejail-7b808e6d3f2bee32e86a42c7bb46154d7c8e1a08.tar.gz firejail-7b808e6d3f2bee32e86a42c7bb46154d7c8e1a08.tar.zst firejail-7b808e6d3f2bee32e86a42c7bb46154d7c8e1a08.zip |
fixes
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -2100,7 +2100,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
2100 | 2100 | ||
2101 | #AC_CONFIG_HEADERS([config.h]) | 2101 | #AC_CONFIG_HEADERS([config.h]) |
2102 | 2102 | ||
2103 | |||
2104 | ac_ext=c | 2103 | ac_ext=c |
2105 | ac_cpp='$CPP $CPPFLAGS' | 2104 | ac_cpp='$CPP $CPPFLAGS' |
2106 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 2105 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
@@ -3106,7 +3105,6 @@ else | |||
3106 | fi | 3105 | fi |
3107 | 3106 | ||
3108 | 3107 | ||
3109 | |||
3110 | HAVE_SPECTRE="no" | 3108 | HAVE_SPECTRE="no" |
3111 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Spectre mitigation support in gcc compiler" >&5 | 3109 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Spectre mitigation support in gcc compiler" >&5 |
3112 | $as_echo_n "checking for Spectre mitigation support in gcc compiler... " >&6; } | 3110 | $as_echo_n "checking for Spectre mitigation support in gcc compiler... " >&6; } |
@@ -3121,7 +3119,7 @@ if test "$HAVE_SPECTRE" = "yes"; then : | |||
3121 | 3119 | ||
3122 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 3120 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
3123 | $as_echo "yes" >&6; } | 3121 | $as_echo "yes" >&6; } |
3124 | EXTRA_CFLAGS+="-mindirect-branch=thunk" | 3122 | EXTRA_CFLAGS+=" -mindirect-branch=thunk " |
3125 | 3123 | ||
3126 | fi | 3124 | fi |
3127 | if test "$HAVE_SPECTRE" = "no"; then : | 3125 | if test "$HAVE_SPECTRE" = "no"; then : |
@@ -3132,7 +3130,6 @@ $as_echo "... not available" >&6; } | |||
3132 | fi | 3130 | fi |
3133 | 3131 | ||
3134 | 3132 | ||
3135 | |||
3136 | HAVE_APPARMOR="" | 3133 | HAVE_APPARMOR="" |
3137 | # Check whether --enable-apparmor was given. | 3134 | # Check whether --enable-apparmor was given. |
3138 | if test "${enable_apparmor+set}" = set; then : | 3135 | if test "${enable_apparmor+set}" = set; then : |
@@ -3147,7 +3144,6 @@ if test "x$enable_apparmor" = "xyes"; then : | |||
3147 | fi | 3144 | fi |
3148 | 3145 | ||
3149 | 3146 | ||
3150 | |||
3151 | ac_ext=c | 3147 | ac_ext=c |
3152 | ac_cpp='$CPP $CPPFLAGS' | 3148 | ac_cpp='$CPP $CPPFLAGS' |
3153 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 3149 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
@@ -3559,7 +3555,7 @@ fi | |||
3559 | fi | 3555 | fi |
3560 | if test "x$enable_apparmor" = "xyes"; then : | 3556 | if test "x$enable_apparmor" = "xyes"; then : |
3561 | 3557 | ||
3562 | EXTRA_LDFLAGS+="-lapparmor " | 3558 | EXTRA_LDFLAGS+=" -lapparmor " |
3563 | 3559 | ||
3564 | fi | 3560 | fi |
3565 | 3561 | ||
@@ -3753,7 +3749,7 @@ fi | |||
3753 | if test "x$enable_gcov" = "xyes"; then : | 3749 | if test "x$enable_gcov" = "xyes"; then : |
3754 | 3750 | ||
3755 | HAVE_GCOV="--coverage -DHAVE_GCOV " | 3751 | HAVE_GCOV="--coverage -DHAVE_GCOV " |
3756 | EXTRA_LDFLAGS+="-lgcov --coverage " | 3752 | EXTRA_LDFLAGS+=" -lgcov --coverage " |
3757 | 3753 | ||
3758 | 3754 | ||
3759 | fi | 3755 | fi |