diff options
Diffstat (limited to 'pkgs/build-support/gcc-wrapper-old')
| -rw-r--r-- | pkgs/build-support/gcc-wrapper-old/add-flags | 10 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-wrapper-old/builder.sh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/build-support/gcc-wrapper-old/add-flags b/pkgs/build-support/gcc-wrapper-old/add-flags index 7714a6305739..93da917a5415 100644 --- a/pkgs/build-support/gcc-wrapper-old/add-flags +++ b/pkgs/build-support/gcc-wrapper-old/add-flags @@ -1,12 +1,12 @@ -# `-B@out@/bin' forces gcc to use ld-wrapper.sh when calling ld. +# `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE" if test -e @out@/nix-support/libc-cflags; then export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" fi -if test -e @out@/nix-support/gcc-cflags; then - export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE" +if test -e @out@/nix-support/cc-cflags; then + export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE" fi if test -e @out@/nix-support/gnat-cflags; then @@ -17,8 +17,8 @@ if test -e @out@/nix-support/libc-ldflags; then export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)" fi -if test -e @out@/nix-support/gcc-ldflags; then - export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/gcc-ldflags)" +if test -e @out@/nix-support/cc-ldflags; then + export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/cc-ldflags)" fi if test -e @out@/nix-support/libc-ldflags-before; then diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh index 1fa72deb234e..a8e8a370ec0d 100644 --- a/pkgs/build-support/gcc-wrapper-old/builder.sh +++ b/pkgs/build-support/gcc-wrapper-old/builder.sh @@ -45,7 +45,7 @@ else if [ -n "$langVhdl" ]; then gccLDFlags="$gccLDFlags -L$zlib/lib" fi - echo "$gccLDFlags" > $out/nix-support/gcc-ldflags + echo "$gccLDFlags" > $out/nix-support/cc-ldflags # GCC shows $gcc/lib in `gcc -print-search-dirs', but not # $gcc/lib64 (even though it does actually search there...).. @@ -63,7 +63,7 @@ else gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib" echo "$gnatCFlags" > $out/nix-support/gnat-cflags fi - echo "$gccCFlags" > $out/nix-support/gcc-cflags + echo "$gccCFlags" > $out/nix-support/cc-cflags gccPath="$gcc/bin" # On Illumos/Solaris we might prefer native ld |