diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | contrib/guix/manifest.scm | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 20992380d2..b151064437 100644 --- a/configure.ac +++ b/configure.ac @@ -986,12 +986,6 @@ if test "$use_hardening" != "no"; then AX_CHECK_LINK_FLAG([-Wl,-z,now], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"], [], [$LDFLAG_WERROR]) AX_CHECK_LINK_FLAG([-Wl,-z,separate-code], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,separate-code"], [], [$LDFLAG_WERROR]) AX_CHECK_LINK_FLAG([-fPIE -pie], [PIE_FLAGS="-fPIE"; HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"], [], [$CXXFLAG_WERROR]) - - case $host in - *mingw*) - AC_CHECK_LIB([ssp], [main], [], [AC_MSG_ERROR([libssp missing])]) - ;; - esac fi dnl These flags are specific to ld64, and may cause issues with other linkers. diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 7a030e5eab..8acce55aa3 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -411,12 +411,8 @@ inspecting signatures in Mach-O binaries.") `(append ,flags ;; https://gcc.gnu.org/install/configure.html (list "--enable-threads=posix", - building-on))) - ((#:make-flags flags) - ;; Uses the SSP functions from glibc instead of from libssp.so. - ;; Our 'symbol-check' script will complain if we link against libssp.so, - ;; and thus will ensure that this works properly. - `(cons "gcc_cv_libc_provides_ssp=yes" ,flags)))))) + "--enable-default-ssp=yes", + building-on))))))) (define-public linux-base-gcc (package |