diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef1029fb41f..5bf9ab202c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1694,13 +1694,7 @@ let
 
   ccl = builderDefsPackage ../development/compilers/ccl {};
 
-  clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix {
-    # There is a bug in gcc-4.5 that prevents building a release build of
-    # clang-3.0
-    stdenv = if stdenv.isLinux
-      then (stdenvAdapters.overrideGCC stdenv gcc46)
-      else stdenv;
-  };
+  clangUnwrapped = callPackage ../development/compilers/llvm/clang.nix { };
 
   clang = wrapClang clangUnwrapped;