diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-05 11:59:18 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-05 14:05:14 +0100 |
| commit | 96cbdc70f239a25ea22d49f205c6168b526079df (patch) | |
| tree | 727d73956f1bf2ad203c3982f9d23ef3ececed12 | |
| parent | 89036ef76ab09af6ba324c896f0db00ae1ebaab0 (diff) | |
| download | nixlib-96cbdc70f239a25ea22d49f205c6168b526079df.tar nixlib-96cbdc70f239a25ea22d49f205c6168b526079df.tar.gz nixlib-96cbdc70f239a25ea22d49f205c6168b526079df.tar.bz2 nixlib-96cbdc70f239a25ea22d49f205c6168b526079df.tar.lz nixlib-96cbdc70f239a25ea22d49f205c6168b526079df.tar.xz nixlib-96cbdc70f239a25ea22d49f205c6168b526079df.tar.zst nixlib-96cbdc70f239a25ea22d49f205c6168b526079df.zip | |
cc-wrapper: fix #10574: old gcc -> cc fallout
The part with gcc-wrapper-old changes is rather unimportant, as it's almost unused but I still tested that the sole user `gnat` builds.
| -rw-r--r-- | pkgs/build-support/cc-wrapper/add-flags | 6 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-wrapper-old/add-flags | 10 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-wrapper-old/builder.sh | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/build-support/cc-wrapper/add-flags b/pkgs/build-support/cc-wrapper/add-flags index d48361539047..5634c82aa285 100644 --- a/pkgs/build-support/cc-wrapper/add-flags +++ b/pkgs/build-support/cc-wrapper/add-flags @@ -1,11 +1,11 @@ -# `-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 [ -e @out@/nix-support/libc-cflags ]; then export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" fi -if [ -e @out@/nix-support/gcc-cflags ]; then +if [ -e @out@/nix-support/cc-cflags ]; then export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE" fi @@ -17,7 +17,7 @@ if [ -e @out@/nix-support/libc-ldflags ]; then export NIX_LDFLAGS+=" $(cat @out@/nix-support/libc-ldflags)" fi -if [ -e @out@/nix-support/gcc-ldflags ]; then +if [ -e @out@/nix-support/cc-ldflags ]; then export NIX_LDFLAGS+=" $(cat @out@/nix-support/cc-ldflags)" fi 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 59cdd3f84ad2..7bb487096145 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 |