diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-10 15:23:16 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-11 22:26:39 +0200 |
| commit | 0d67d13527f0b984ae4a1d0f362a947b16a86bf8 (patch) | |
| tree | 2cf2f4824ba55afda45f0d9b67e5c73019efe57c /pkgs/build-support/gcc-wrapper | |
| parent | 02122ccfd0f4c4156c38662622831e7b6b98dbc8 (diff) | |
| download | nixpkgs-0d67d13527f0b984ae4a1d0f362a947b16a86bf8.tar nixpkgs-0d67d13527f0b984ae4a1d0f362a947b16a86bf8.tar.gz nixpkgs-0d67d13527f0b984ae4a1d0f362a947b16a86bf8.tar.bz2 nixpkgs-0d67d13527f0b984ae4a1d0f362a947b16a86bf8.tar.lz nixpkgs-0d67d13527f0b984ae4a1d0f362a947b16a86bf8.tar.xz nixpkgs-0d67d13527f0b984ae4a1d0f362a947b16a86bf8.tar.zst nixpkgs-0d67d13527f0b984ae4a1d0f362a947b16a86bf8.zip | |
gcc-wrapper: Style fix
Diffstat (limited to 'pkgs/build-support/gcc-wrapper')
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/add-flags | 4 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/setup-hook.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/gcc-wrapper/add-flags b/pkgs/build-support/gcc-wrapper/add-flags index ede1a868303..d75f378e2c9 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 93b20fa1e99..a6b7edbcb69 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 } |