Revert gcc darwin fixes

This reverts commits cb7c053383ff76a454484992b3a6d6a2f1530c15,
ebda45e6b9db3225c30a998b2624d90b0c08edb4,
4a495cfbab2b3ab9ae8219ef1812c766bf27b01e because they broke Nixpkgs
evaluation.

http://hydra.nixos.org/build/24813270

pkgs/development/compilers/gcc/4.8/default.nix

···
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
-, CF ? null
+, gnused ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
···
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
-# Make sure we get CoreFoundation
-assert stdenv.isDarwin -> CF != null;
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
···
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
     ;
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
···
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
     export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    configureFlagsArray+=(
-      --with-sysroot="${stdenv.libc}"
-      --with-native-system-header-dir=/include
-    )
+    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
+      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
+      makeFlagsArray+=( \
+       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
+       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+      )
+    fi
   '';
 
   dontDisableStatic = true;
···
                                           ++ optionals javaAwtGtk [ gmp mpfr ]
                                           ++ optional (libpthread != null) libpthread)));
 
-  extraFlags =
-    (if cross != null && libcCross != null
+  EXTRA_TARGET_CFLAGS =
+    if cross != null && libcCross != null
     then "-idirafter ${libcCross}/include"
-    else "") + optionalString stdenv.isDarwin " -F${CF}/Library/Frameworks";
+    else null;
 
   EXTRA_TARGET_LDFLAGS =
     if cross != null && libcCross != null

pkgs/development/compilers/gcc/4.9/default.nix

···
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
-, CF ? null
+, gnused ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
···
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
-# Make sure we get CoreFoundation
-assert stdenv.isDarwin -> CF != null;
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
···
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
     ;
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
···
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
     export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    configureFlagsArray+=(
-      --with-sysroot="${stdenv.libc}"
-      --with-native-system-header-dir=/include
-    )
+    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
+      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
+      makeFlagsArray+=( \
+       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
+       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+      )
+    fi
   '';
 
   dontDisableStatic = true;
···
                                           ++ optionals javaAwtGtk [ gmp mpfr ]
                                           ++ optional (libpthread != null) libpthread)));
 
-  extraFlags =
-    (if cross != null && libcCross != null
+  EXTRA_TARGET_CFLAGS =
+    if cross != null && libcCross != null
     then "-idirafter ${libcCross}/include"
-    else "") + optionalString stdenv.isDarwin " -F${CF}/Library/Frameworks";
+    else null;
 
   EXTRA_TARGET_LDFLAGS =
     if cross != null && libcCross != null

pkgs/development/compilers/gcc/5/default.nix

···
 , gnat ? null
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
 , stripped ? true
-, CF ? null
+, gnused ? null
+, binutils ? null
 }:
 
 assert langJava     -> zip != null && unzip != null
···
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
-# Make sure we get CoreFoundation.
-assert stdenv.isDarwin -> CF != null;
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
+
+# Need c++filt on darwin
+assert stdenv.isDarwin -> binutils != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
···
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
+    ++ (optional stdenv.isDarwin binutils)
     ;
 
   NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
···
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
     export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    configureFlagsArray+=(
-      --with-sysroot="${stdenv.libc}"
-      --with-native-system-header-dir=/include
-    )
+    if SDKROOT=$(/usr/bin/xcrun --show-sdk-path); then
+      configureFlagsArray+=(--with-native-system-header-dir=$SDKROOT/usr/include)
+      makeFlagsArray+=( \
+       CFLAGS_FOR_BUILD=-F$SDKROOT/System/Library/Frameworks \
+       CFLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+       FLAGS_FOR_TARGET=-F$SDKROOT/System/Library/Frameworks \
+      )
+    fi
   '';
 
   dontDisableStatic = true;
···
                                           ++ optionals javaAwtGtk [ gmp mpfr ]
                                           ++ optional (libpthread != null) libpthread)));
 
-  extraFlags =
-    (if cross != null && libcCross != null
+  EXTRA_TARGET_CFLAGS =
+    if cross != null && libcCross != null
     then "-idirafter ${libcCross}/include"
-    else "") + optionalString stdenv.isDarwin " -F${CF}/Library/Frameworks";
+    else null;
 
   EXTRA_TARGET_LDFLAGS =
     if cross != null && libcCross != null

pkgs/development/compilers/gcc/builder.sh

···
 
         # Figure out what extra flags to pass to the gcc compilers
         # being generated to make sure that they use our glibc.
-        extraFlags="$(cat $NIX_CC/nix-support/libc-cflags) ${extraFlags}"
-        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags)"
-        if [ -e "$NIX_CC/nix-support/libc-ldflags-before" ]; then
-          extraLDFlags+=" $(cat $NIX_CC/nix-support/libc-ldflags-before)"
-        fi
+        extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"
+        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"
 
         # Use *real* header files, otherwise a limits.h is generated
         # that does not include Glibc's limits.h (notably missing

pkgs/top-level/all-packages.nix

···
     libcCross = if crossSystem != null then libcCross else null;
 
     isl = isl_0_14;
-
-    inherit (darwin) CF;
   }));
 
   gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 {
···
     isl = isl_0_11;
 
     cloog = cloog_0_18_0;
-
-    inherit (darwin) CF;
   }));
 
   gcc5 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5 {
···
     libcCross = if crossSystem != null then libcCross else null;
 
     isl = isl_0_14;
-
-    inherit (darwin) CF;
   }));
 
   gfortran = if !stdenv.isDarwin then gfortran49