diff --git a/pkgs/stdenv/gcc-wrapper.sh b/pkgs/stdenv-linux/gcc-wrapper.sh similarity index 94% rename from pkgs/stdenv/gcc-wrapper.sh rename to pkgs/stdenv-linux/gcc-wrapper.sh index 63530408bfd..9e1b26698bb 100644 --- a/pkgs/stdenv/gcc-wrapper.sh +++ b/pkgs/stdenv-linux/gcc-wrapper.sh @@ -3,7 +3,6 @@ IFS= realgcc=@GCC@ -libc=@LIBC@ justcompile=0 for i in $@; do @@ -19,7 +18,7 @@ for i in $@; do done IFS=" " -extra=$NIX_CFLAGS +extra=($NIX_CFLAGS) if test "$justcompile" != "1"; then extra=(${extra[@]} $NIX_LDFLAGS) fi diff --git a/pkgs/stdenv/stdenv-build.sh b/pkgs/stdenv-linux/stdenv-build.sh similarity index 100% rename from pkgs/stdenv/stdenv-build.sh rename to pkgs/stdenv-linux/stdenv-build.sh diff --git a/pkgs/stdenv-linux/stdenv.fix b/pkgs/stdenv-linux/stdenv.fix new file mode 100644 index 00000000000..050095de48d --- /dev/null +++ b/pkgs/stdenv-linux/stdenv.fix @@ -0,0 +1,9 @@ +Package( + [ ("name", "stdenv-linux") + , ("build", Relative("stdenv-linux/stdenv-build.sh")) + + , ("gccwrapper", Relative("stdenv-linux/gcc-wrapper.sh")) + + , ("glibc", IncludeFix("glibc/glibc.fix")) + ] +) diff --git a/pkgs/stdenv/stdenv.fix b/pkgs/stdenv/stdenv.fix deleted file mode 100644 index 375b7a01d84..00000000000 --- a/pkgs/stdenv/stdenv.fix +++ /dev/null @@ -1,9 +0,0 @@ -Package( - [ ("name", "stdenv-linux") - , ("build", Relative("stdenv/stdenv-build.sh")) - - , ("gccwrapper", Relative("stdenv/gcc-wrapper.sh")) - - , ("glibc", IncludeFix("glibc/glibc.fix")) - ] -)