From b2d670be60b883192d12f79077fa79dff5395554 Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 26 Jan 2021 20:17:55 +0100 Subject: [PATCH] build-style/void-cross: always enable libssp this way we'll be able to provide libssp(-devel) unconditionally inside cross-vpkg-dummy, which should be the right thing to do --- common/build-style/void-cross.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index 23b8d539dbf..055b3dc3ce7 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -372,14 +372,12 @@ _void_cross_build_gcc() { local extra_args if [ -f ${wrksrc}/.musl_version ]; then - extra_args+=" --enable-libssp" # otherwise glibc hosts get confused and use the gnu impl extra_args+=" --enable-clocale=generic" extra_args+=" --disable-symvers" extra_args+=" --disable-gnu-unique-object" extra_args+=" libat_cv_have_ifunc=no" else - extra_args+=" --disable-libssp" extra_args+=" --enable-gnu-unique-object" fi @@ -419,6 +417,7 @@ _void_cross_build_gcc() { --enable-lto \ --enable-default-pie \ --enable-default-ssp \ + --enable-libssp \ --with-gnu-ld \ --with-gnu-as \ --with-linker-hash-style=gnu \