misc pkgs: Remove unneeded *Platform == *Platform comparisons

PR #26007 used these to avoid causing a mass rebuild. Now that we know
things work, we do that to clean up.
This commit is contained in:
John Ericson
2017-06-30 10:09:31 -04:00
parent d61c22341b
commit 95c8277701
18 changed files with 84 additions and 75 deletions
+9 -6
View File
@@ -1,10 +1,12 @@
{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2
, llvm, libcxx, libcxxabi, clang, libuuid
, libobjc ? null, maloader ? null, xctoolchain ? null
, buildPlatform, hostPlatform, targetPlatform
, hostPlatform, targetPlatform
}:
let
# The prefix prepended to binary names to allow multiple binuntils on the
# PATH to both be usable.
prefix = stdenv.lib.optionalString
(targetPlatform != hostPlatform)
"${targetPlatform.config}-";
@@ -38,13 +40,10 @@ let
enableParallelBuilding = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [
"CXXFLAGS=-I${libcxx}/include/c++/v1"
] ++ stdenv.lib.optionals (targetPlatform != buildPlatform) [
# TODO make unconditional next hash break
"--build=${buildPlatform.config}"
"--host=${hostPlatform.config}"
"--target=${targetPlatform.config}"
];
postPatch = ''
@@ -104,6 +103,10 @@ let
done
'';
passthru = {
inherit prefix;
};
meta = {
homepage = "http://www.opensource.apple.com/source/cctools/";
description = "Mac OS X Compiler Tools (cross-platform port)";