glibc: Make the native store path independent on whether `gccCross' is null.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23283

pkgs/development/libraries/glibc-2.12/common.nix

@@ -108,9 +108,9 @@ stdenv.mkDerivation ({
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686";
 }
 
-# FIXME: This is way too broad and causes the *native* glibc to have a
-# different store path dependending on whether `cross' is null or not.
-// args //
+# Remove the `gccCross' attribute so that the *native* glibc store path
+# doesn't depend on whether `gccCross' is null or not.
+// (removeAttrs args [ "gccCross" ]) //
 
 {
   name = name + "-${version}" +