From 514a478e614f0ac439f84f72e2f9814f2bc1d01f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 9 Mar 2016 10:08:07 +0100 Subject: [PATCH] cc-wrapper: Fix if syntax --- pkgs/build-support/cc-wrapper/add-hardening | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/add-hardening b/pkgs/build-support/cc-wrapper/add-hardening index abfd49766db..82477c6b7d9 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening +++ b/pkgs/build-support/cc-wrapper/add-hardening @@ -14,39 +14,39 @@ if [[ ! $hardeningDisable == "all" ]]; then if [[ ! "${hardeningDisable[@]}" =~ "$flag" ]]; then case $flag in fortify) - if [ -n "$NIX_DEBUG" ]; then echo HARDENING: enabling fortify; fi + if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling fortify; fi hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2') ;; stackprotector) - if [ -n "$NIX_DEBUG" ]; then echo HARDENING: enabling stackprotector; fi + if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling stackprotector; fi hardeningCFlags+=('-fstack-protector-strong' '--param ssp-buffer-size=4') ;; pie) - if [ -n "$NIX_DEBUG" ]; then echo HARDENING: enabling CFlags -fPIE; fi + if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling CFlags -fPIE; fi hardeningCFlags+=('-fPIE') if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then - if [ -n "$NIX_DEBUG" ]; then echo HARDENING: enabling LDFlags -pie; fi + if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling LDFlags -pie; fi hardeningLDFlags+=('-pie') fi ;; pic) - if [ -n "$NIX_DEBUG" ]; then echo HARDENING: enabling pic; fi + if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling pic; fi hardeningCFlags+=('-fPIC') ;; strictoverflow) - if [ -n "$NIX_DEBUG" ]; then echo HARDENING: enabling strictoverflow; fi + if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling strictoverflow; fi hardeningCFlags+=('-fno-strict-overflow') ;; format) - if [ -n "$NIX_DEBUG" ]; then echo HARDENING: enabling format; fi + if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling format; fi hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security') ;; relro) - if [ -n "$NIX_DEBUG" ]; then echo HARDENING: enabling relro; fi + if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling relro; fi hardeningLDFlags+=('-z relro') ;; bindnow) - if [ -n "$NIX_DEBUG" ]; then echo HARDENING: enabling bindnow; fi + if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling bindnow; fi hardeningLDFlags+=('-z now') ;; *)