diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 53 |
1 files changed, 48 insertions, 5 deletions
@@ -646,6 +646,7 @@ EGREP | |||
646 | GREP | 646 | GREP |
647 | CPP | 647 | CPP |
648 | HAVE_APPARMOR | 648 | HAVE_APPARMOR |
649 | EXTRA_CFLAGS | ||
649 | RANLIB | 650 | RANLIB |
650 | INSTALL_DATA | 651 | INSTALL_DATA |
651 | INSTALL_SCRIPT | 652 | INSTALL_SCRIPT |
@@ -2099,7 +2100,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
2099 | 2100 | ||
2100 | #AC_CONFIG_HEADERS([config.h]) | 2101 | #AC_CONFIG_HEADERS([config.h]) |
2101 | 2102 | ||
2102 | |||
2103 | ac_ext=c | 2103 | ac_ext=c |
2104 | ac_cpp='$CPP $CPPFLAGS' | 2104 | ac_cpp='$CPP $CPPFLAGS' |
2105 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 2105 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
@@ -3105,6 +3105,47 @@ else | |||
3105 | fi | 3105 | fi |
3106 | 3106 | ||
3107 | 3107 | ||
3108 | HAVE_SPECTRE="no" | ||
3109 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Spectre mitigation support in gcc or clang compiler" >&5 | ||
3110 | $as_echo_n "checking for Spectre mitigation support in gcc or clang compiler... " >&6; } | ||
3111 | if test "$CC" = "gcc"; then : | ||
3112 | |||
3113 | HAVE_SPECTRE="yes" | ||
3114 | $CC -mindirect-branch=thunk -c dummy.c || HAVE_SPECTRE="no" | ||
3115 | rm -f dummy.o | ||
3116 | if test "$HAVE_SPECTRE" = "yes"; then : | ||
3117 | |||
3118 | EXTRA_CFLAGS+=" -mindirect-branch=thunk " | ||
3119 | |||
3120 | fi | ||
3121 | |||
3122 | fi | ||
3123 | if test "$CC" = "clang"; then : | ||
3124 | |||
3125 | HAVE_SPECTRE="yes" | ||
3126 | $CC -mretpoline -c dummy.c || HAVE_SPECTRE="no" | ||
3127 | rm -f dummy.o | ||
3128 | if test "$HAVE_SPECTRE" = "yes"; then : | ||
3129 | |||
3130 | EXTRA_CFLAGS+=" -mretpoline " | ||
3131 | |||
3132 | fi | ||
3133 | |||
3134 | fi | ||
3135 | if test "$HAVE_SPECTRE" = "yes"; then : | ||
3136 | |||
3137 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3138 | $as_echo "yes" >&6; } | ||
3139 | |||
3140 | fi | ||
3141 | if test "$HAVE_SPECTRE" = "no"; then : | ||
3142 | |||
3143 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ... not available" >&5 | ||
3144 | $as_echo "... not available" >&6; } | ||
3145 | |||
3146 | fi | ||
3147 | |||
3148 | |||
3108 | HAVE_APPARMOR="" | 3149 | HAVE_APPARMOR="" |
3109 | # Check whether --enable-apparmor was given. | 3150 | # Check whether --enable-apparmor was given. |
3110 | if test "${enable_apparmor+set}" = set; then : | 3151 | if test "${enable_apparmor+set}" = set; then : |
@@ -3119,7 +3160,6 @@ if test "x$enable_apparmor" = "xyes"; then : | |||
3119 | fi | 3160 | fi |
3120 | 3161 | ||
3121 | 3162 | ||
3122 | |||
3123 | ac_ext=c | 3163 | ac_ext=c |
3124 | ac_cpp='$CPP $CPPFLAGS' | 3164 | ac_cpp='$CPP $CPPFLAGS' |
3125 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | 3165 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
@@ -3531,7 +3571,7 @@ fi | |||
3531 | fi | 3571 | fi |
3532 | if test "x$enable_apparmor" = "xyes"; then : | 3572 | if test "x$enable_apparmor" = "xyes"; then : |
3533 | 3573 | ||
3534 | EXTRA_LDFLAGS+="-lapparmor " | 3574 | EXTRA_LDFLAGS+=" -lapparmor " |
3535 | 3575 | ||
3536 | fi | 3576 | fi |
3537 | 3577 | ||
@@ -3725,7 +3765,7 @@ fi | |||
3725 | if test "x$enable_gcov" = "xyes"; then : | 3765 | if test "x$enable_gcov" = "xyes"; then : |
3726 | 3766 | ||
3727 | HAVE_GCOV="--coverage -DHAVE_GCOV " | 3767 | HAVE_GCOV="--coverage -DHAVE_GCOV " |
3728 | EXTRA_LDFLAGS+="-lgcov --coverage " | 3768 | EXTRA_LDFLAGS+=" -lgcov --coverage " |
3729 | 3769 | ||
3730 | 3770 | ||
3731 | fi | 3771 | fi |
@@ -3823,7 +3863,7 @@ if test "$prefix" = /usr; then | |||
3823 | sysconfdir="/etc" | 3863 | sysconfdir="/etc" |
3824 | fi | 3864 | fi |
3825 | 3865 | ||
3826 | ac_config_files="$ac_config_files Makefile src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile src/ftee/Makefile src/faudit/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile" | 3866 | ac_config_files="$ac_config_files Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile src/ftee/Makefile src/faudit/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile" |
3827 | 3867 | ||
3828 | cat >confcache <<\_ACEOF | 3868 | cat >confcache <<\_ACEOF |
3829 | # This file is a shell script that caches the results of configure | 3869 | # This file is a shell script that caches the results of configure |
@@ -4533,6 +4573,7 @@ for ac_config_target in $ac_config_targets | |||
4533 | do | 4573 | do |
4534 | case $ac_config_target in | 4574 | case $ac_config_target in |
4535 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; | 4575 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
4576 | "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;; | ||
4536 | "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;; | 4577 | "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;; |
4537 | "src/fcopy/Makefile") CONFIG_FILES="$CONFIG_FILES src/fcopy/Makefile" ;; | 4578 | "src/fcopy/Makefile") CONFIG_FILES="$CONFIG_FILES src/fcopy/Makefile" ;; |
4538 | "src/fnet/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnet/Makefile" ;; | 4579 | "src/fnet/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnet/Makefile" ;; |
@@ -5024,7 +5065,9 @@ echo " file transfer support: $HAVE_FILE_TRANSFER" | |||
5024 | echo " overlayfs support: $HAVE_OVERLAYFS" | 5065 | echo " overlayfs support: $HAVE_OVERLAYFS" |
5025 | echo " git install support: $HAVE_GIT_INSTALL" | 5066 | echo " git install support: $HAVE_GIT_INSTALL" |
5026 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 5067 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
5068 | echo " Spectre compiler patch: $HAVE_SPECTRE" | ||
5027 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 5069 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |
5070 | echo " EXTRA_CFLAGS: $EXTRA_CFLAGS" | ||
5028 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 5071 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
5029 | echo " Gcov instrumentation: $HAVE_GCOV" | 5072 | echo " Gcov instrumentation: $HAVE_GCOV" |
5030 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" | 5073 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" |