Merge commit '43d5c5d6db3ce33f3cf1d17ba43c7374257466ec' into gcc-modernize-builder

2017-12-07 02:19:04 -05:00
parent e82bd498d1 43d5c5d6db
commit 3afe325a3e
1286 changed files with 31659 additions and 79981 deletions
@@ -489,7 +489,7 @@ stdenv.mkDerivation ({
  EXTRA_TARGET_FLAGS = optionals
    (targetPlatform != hostPlatform && libcCross != null)
    ([
-      "-idirafter ${libcCross.dev}/include"
+      "-idirafter ${getDev libcCross}/include"
    ] ++ optionals (! crossStageStatic) [
      "-B${libcCross.out}/lib"
    ]);