From 53c1db3906e8aab535f98381f25807700f43507a Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 21 Dec 2016 10:23:47 +0100 Subject: [PATCH] profiles/prefix/darwin: define CHOST_ for llvm --- profiles/prefix/darwin/macos/10.10/x64/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.10/x86/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.11/x64/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.11/x86/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.12/x64/make.defaults | 6 +----- profiles/prefix/darwin/macos/10.12/x86/make.defaults | 6 +----- profiles/prefix/darwin/macos/10.4/ppc/make.defaults | 5 ++--- profiles/prefix/darwin/macos/10.4/x86/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.5/ppc/make.defaults | 5 ++--- profiles/prefix/darwin/macos/10.5/x64/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.5/x86/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.6/x64/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.6/x86/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.7/x64/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.7/x86/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.8/x64/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.8/x86/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.9/x64/make.defaults | 8 ++------ profiles/prefix/darwin/macos/10.9/x86/make.defaults | 8 ++------ profiles/prefix/darwin/macos/arch/ppc/make.defaults | 5 ++++- profiles/prefix/darwin/macos/arch/x64/make.defaults | 8 +++++++- profiles/prefix/darwin/macos/arch/x86/make.defaults | 8 +++++++- 22 files changed, 54 insertions(+), 109 deletions(-) diff --git a/profiles/prefix/darwin/macos/10.10/x64/make.defaults b/profiles/prefix/darwin/macos/10.10/x64/make.defaults index 0209010436026..71591b9128143 100644 --- a/profiles/prefix/darwin/macos/10.10/x64/make.defaults +++ b/profiles/prefix/darwin/macos/10.10/x64/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x64-macos" CHOST="x86_64-apple-darwin14" -ACCEPT_KEYWORDS="~x64-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_amd64="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.10/x86/make.defaults b/profiles/prefix/darwin/macos/10.10/x86/make.defaults index c372b5cae740f..99b9e28ea4977 100644 --- a/profiles/prefix/darwin/macos/10.10/x86/make.defaults +++ b/profiles/prefix/darwin/macos/10.10/x86/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x86-macos" CHOST="i686-apple-darwin14" -ACCEPT_KEYWORDS="~x86-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_x86="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.11/x64/make.defaults b/profiles/prefix/darwin/macos/10.11/x64/make.defaults index b9464e7a2a0ed..8ca84707faae6 100644 --- a/profiles/prefix/darwin/macos/10.11/x64/make.defaults +++ b/profiles/prefix/darwin/macos/10.11/x64/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x64-macos" CHOST="x86_64-apple-darwin15" -ACCEPT_KEYWORDS="~x64-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_amd64="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.11/x86/make.defaults b/profiles/prefix/darwin/macos/10.11/x86/make.defaults index 2e9a6dee39d3c..bdcf0372a7c86 100644 --- a/profiles/prefix/darwin/macos/10.11/x86/make.defaults +++ b/profiles/prefix/darwin/macos/10.11/x86/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x86-macos" CHOST="i686-apple-darwin15" -ACCEPT_KEYWORDS="~x86-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_x86="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.12/x64/make.defaults b/profiles/prefix/darwin/macos/10.12/x64/make.defaults index 05c94818ade2f..8abc6aeaa48f8 100644 --- a/profiles/prefix/darwin/macos/10.12/x64/make.defaults +++ b/profiles/prefix/darwin/macos/10.12/x64/make.defaults @@ -2,9 +2,5 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x64-macos" CHOST="x86_64-apple-darwin16" -ACCEPT_KEYWORDS="~x64-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_amd64="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.12/x86/make.defaults b/profiles/prefix/darwin/macos/10.12/x86/make.defaults index a85c683229705..0ea641e1e301f 100644 --- a/profiles/prefix/darwin/macos/10.12/x86/make.defaults +++ b/profiles/prefix/darwin/macos/10.12/x86/make.defaults @@ -2,9 +2,5 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x86-macos" CHOST="i686-apple-darwin16" -ACCEPT_KEYWORDS="~x86-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_x86="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.4/ppc/make.defaults b/profiles/prefix/darwin/macos/10.4/ppc/make.defaults index 8c58b7fdfacc7..de5ac9be6a34e 100644 --- a/profiles/prefix/darwin/macos/10.4/ppc/make.defaults +++ b/profiles/prefix/darwin/macos/10.4/ppc/make.defaults @@ -1,7 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="ppc-macos" CHOST="powerpc-apple-darwin8" -ACCEPT_KEYWORDS="~ppc-macos" +CHOST_ppc="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.4/x86/make.defaults b/profiles/prefix/darwin/macos/10.4/x86/make.defaults index ff7d41e9b6edf..8196d985f1848 100644 --- a/profiles/prefix/darwin/macos/10.4/x86/make.defaults +++ b/profiles/prefix/darwin/macos/10.4/x86/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x86-macos" CHOST="i686-apple-darwin8" -ACCEPT_KEYWORDS="~x86-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_x86="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.5/ppc/make.defaults b/profiles/prefix/darwin/macos/10.5/ppc/make.defaults index ccee30c668f4b..1ec662c7bfcc9 100644 --- a/profiles/prefix/darwin/macos/10.5/ppc/make.defaults +++ b/profiles/prefix/darwin/macos/10.5/ppc/make.defaults @@ -1,7 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="ppc-macos" CHOST="powerpc-apple-darwin9" -ACCEPT_KEYWORDS="~ppc-macos" +CHOST_ppc="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.5/x64/make.defaults b/profiles/prefix/darwin/macos/10.5/x64/make.defaults index 1c265fd79b9ae..0f49e2605bc64 100644 --- a/profiles/prefix/darwin/macos/10.5/x64/make.defaults +++ b/profiles/prefix/darwin/macos/10.5/x64/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x64-macos" CHOST="x86_64-apple-darwin9" -ACCEPT_KEYWORDS="~x64-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_amd64="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.5/x86/make.defaults b/profiles/prefix/darwin/macos/10.5/x86/make.defaults index 701853b9bfd78..60efebaece16c 100644 --- a/profiles/prefix/darwin/macos/10.5/x86/make.defaults +++ b/profiles/prefix/darwin/macos/10.5/x86/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x86-macos" CHOST="i686-apple-darwin9" -ACCEPT_KEYWORDS="~x86-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_x86="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.6/x64/make.defaults b/profiles/prefix/darwin/macos/10.6/x64/make.defaults index de733d2806a3a..56a2ce92a58ab 100644 --- a/profiles/prefix/darwin/macos/10.6/x64/make.defaults +++ b/profiles/prefix/darwin/macos/10.6/x64/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x64-macos" CHOST="x86_64-apple-darwin10" -ACCEPT_KEYWORDS="~x64-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_amd64="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.6/x86/make.defaults b/profiles/prefix/darwin/macos/10.6/x86/make.defaults index 7cd2a2caba268..e9eb0bce49134 100644 --- a/profiles/prefix/darwin/macos/10.6/x86/make.defaults +++ b/profiles/prefix/darwin/macos/10.6/x86/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x86-macos" CHOST="i686-apple-darwin10" -ACCEPT_KEYWORDS="~x86-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_x86="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.7/x64/make.defaults b/profiles/prefix/darwin/macos/10.7/x64/make.defaults index 34a480e2f1a1d..ef1a45d2b4d72 100644 --- a/profiles/prefix/darwin/macos/10.7/x64/make.defaults +++ b/profiles/prefix/darwin/macos/10.7/x64/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x64-macos" CHOST="x86_64-apple-darwin11" -ACCEPT_KEYWORDS="~x64-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_amd64="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.7/x86/make.defaults b/profiles/prefix/darwin/macos/10.7/x86/make.defaults index a0835e2ad8715..dfffd8e7f895d 100644 --- a/profiles/prefix/darwin/macos/10.7/x86/make.defaults +++ b/profiles/prefix/darwin/macos/10.7/x86/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x86-macos" CHOST="i686-apple-darwin11" -ACCEPT_KEYWORDS="~x86-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_x86="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.8/x64/make.defaults b/profiles/prefix/darwin/macos/10.8/x64/make.defaults index f606f1fbdc5aa..59cce776f17df 100644 --- a/profiles/prefix/darwin/macos/10.8/x64/make.defaults +++ b/profiles/prefix/darwin/macos/10.8/x64/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x64-macos" CHOST="x86_64-apple-darwin12" -ACCEPT_KEYWORDS="~x64-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_amd64="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.8/x86/make.defaults b/profiles/prefix/darwin/macos/10.8/x86/make.defaults index 23d3fd2b89484..3f8cf18d97e10 100644 --- a/profiles/prefix/darwin/macos/10.8/x86/make.defaults +++ b/profiles/prefix/darwin/macos/10.8/x86/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x86-macos" CHOST="i686-apple-darwin12" -ACCEPT_KEYWORDS="~x86-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_x86="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.9/x64/make.defaults b/profiles/prefix/darwin/macos/10.9/x64/make.defaults index e8831181e7014..ad96e6c95501c 100644 --- a/profiles/prefix/darwin/macos/10.9/x64/make.defaults +++ b/profiles/prefix/darwin/macos/10.9/x64/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x64-macos" CHOST="x86_64-apple-darwin13" -ACCEPT_KEYWORDS="~x64-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_amd64="${CHOST}" diff --git a/profiles/prefix/darwin/macos/10.9/x86/make.defaults b/profiles/prefix/darwin/macos/10.9/x86/make.defaults index 092253cac5a27..c0c8c538ac3bc 100644 --- a/profiles/prefix/darwin/macos/10.9/x86/make.defaults +++ b/profiles/prefix/darwin/macos/10.9/x86/make.defaults @@ -1,10 +1,6 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -ARCH="x86-macos" CHOST="i686-apple-darwin13" -ACCEPT_KEYWORDS="~x86-macos" - -USE="mmx mmxext sse sse2" -CPU_FLAGS_X86="mmx mmxext sse sse2" +CHOST_x86="${CHOST}" diff --git a/profiles/prefix/darwin/macos/arch/ppc/make.defaults b/profiles/prefix/darwin/macos/arch/ppc/make.defaults index 6c28906396f81..dec207ac7ee5b 100644 --- a/profiles/prefix/darwin/macos/arch/ppc/make.defaults +++ b/profiles/prefix/darwin/macos/arch/ppc/make.defaults @@ -1,7 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +ARCH="ppc-macos" +ACCEPT_KEYWORDS="~ppc-macos" + # multilib build stuff, single ABI (no multilib) MULTILIB_ABIS="ppc" DEFAULT_ABI="ppc" diff --git a/profiles/prefix/darwin/macos/arch/x64/make.defaults b/profiles/prefix/darwin/macos/arch/x64/make.defaults index 8b994140ed32a..51246a77f2e6f 100644 --- a/profiles/prefix/darwin/macos/arch/x64/make.defaults +++ b/profiles/prefix/darwin/macos/arch/x64/make.defaults @@ -1,7 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +ARCH="x64-macos" +ACCEPT_KEYWORDS="~x64-macos" + +USE="mmx mmxext sse sse2" +CPU_FLAGS_X86="mmx mmxext sse sse2" + # multilib build stuff, single ABI (no multilib) MULTILIB_ABIS="amd64" DEFAULT_ABI="amd64" diff --git a/profiles/prefix/darwin/macos/arch/x86/make.defaults b/profiles/prefix/darwin/macos/arch/x86/make.defaults index 3a38bd918d51f..8a721e619da4a 100644 --- a/profiles/prefix/darwin/macos/arch/x86/make.defaults +++ b/profiles/prefix/darwin/macos/arch/x86/make.defaults @@ -1,7 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ +ARCH="x86-macos" +ACCEPT_KEYWORDS="~x86-macos" + +USE="mmx mmxext sse sse2" +CPU_FLAGS_X86="mmx mmxext sse sse2" + # multilib build stuff, single ABI (no multilib) MULTILIB_ABIS="x86" DEFAULT_ABI="x86"