diff --git a/pkgs/build-support/gcc-wrapper/add-flags b/pkgs/build-support/gcc-wrapper/add-flags index ede1a8683039..d75f378e2c97 100644 --- a/pkgs/build-support/gcc-wrapper/add-flags +++ b/pkgs/build-support/gcc-wrapper/add-flags @@ -14,11 +14,11 @@ if [ -e @out@/nix-support/gnat-cflags ]; then fi if [ -e @out@/nix-support/libc-ldflags ]; then - export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)" + export NIX_LDFLAGS+=" $(cat @out@/nix-support/libc-ldflags)" fi if [ -e @out@/nix-support/gcc-ldflags ]; then - export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/gcc-ldflags)" + export NIX_LDFLAGS+=" $(cat @out@/nix-support/gcc-ldflags)" fi if [ -e @out@/nix-support/libc-ldflags-before ]; then diff --git a/pkgs/build-support/gcc-wrapper/setup-hook.sh b/pkgs/build-support/gcc-wrapper/setup-hook.sh index 93b20fa1e99a..a6b7edbcb694 100644 --- a/pkgs/build-support/gcc-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-wrapper/setup-hook.sh @@ -2,15 +2,15 @@ export NIX_GCC=@out@ addCVars () { if [ -d $1/include ]; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include" + export NIX_CFLAGS_COMPILE+=" -isystem $1/include" fi if [ -d $1/lib64 -a ! -L $1/lib64 ]; then - export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64" + export NIX_LDFLAGS+=" -L$1/lib64" fi if [ -d $1/lib ]; then - export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib" + export NIX_LDFLAGS+=" -L$1/lib" fi }