Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=6851cc6922db12fcf8fe9116150a894477d802ed
commit 6851cc6922db12fcf8fe9116150a894477d802ed Author: crazy <cr...@frugalware.org> Date: Sun Feb 4 21:22:42 2018 +0100 duh.. forgot to push that check for noprotect need be moved up diff --git a/scripts/makepkg b/scripts/makepkg index 47c473d..c9ecc3b 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -1420,6 +1420,17 @@ fi if [ "$INCHROOT" == "1" ]; then + ## add before PLT + if [ "`check_option NOPROTECTOR`" ]; then + warning "Disabling -fstack-protector-strong in C/CXX FLAGS." + warning "Do that only with an GOOD reason.." + else + msg "Enabling -fstack-protector-strong in C/CXX FLAGS" + CFLAGS+=" -fstack-protector-strong" + CXXFLAGS+=" -fstack-protector-strong" + export CFLAGS CXXFLAGS + fi + if $ECHO $LDFLAGS | grep -q "\-Wl,--hash-style=both" ; then error "You are using -Wl,--hash-style=both" error "LDFLAGS changed to -Wl,--hash-style=gnu" @@ -1494,16 +1505,6 @@ if [ "$INCHROOT" == "1" ]; then export CFLAGS CXXFLAGS fi - ## add before PLT - if [ "`check_option NOPROTECTOR`" ]; then - warning "Disabling -fstack-protector-strong in C/CXX FLAGS." - warning "Do that only with an GOOD reason.." - else - msg "Enabling -fstack-protector-strong in C/CXX FLAGS" - CFLAGS+=" -fstack-protector-strong" - CXXFLAGS+=" -fstack-protector-strong" - export CFLAGS CXXFLAGS - fi if [ "`check_option PLT`" ]; then warning "Disabling -fno-plt C/CXX FLAGS" _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
