Attachment #152522 for bug #197259

Lines 204-210 Link Here

(-)share/mk/src.opts.mk (-1 / +1 lines)
204	# If the compiler is not C++11 capable, disable clang and use gcc instead.	204	# If the compiler is not C++11 capable, disable clang and use gcc instead.
205	__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX	205	__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
206	__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC	206	__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
207	.elif ${__T} == "amd64" \|\| ${__T} == "i386"	207	.elif ${__T} == "amd64" \|\| ${__T} == "i386" \|\| ${__T} == "mips64"
208	# On x86, clang is enabled, and will be installed as the default cc.	208	# On x86, clang is enabled, and will be installed as the default cc.
209	__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC	209	__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
210	__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX	210	__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX

Return to bug 197259

Lines 2067-2072 Link Here

(-)contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp (-1 / +3 lines)
2067	getTriple().getArch() == llvm::Triple::armeb \|\|	2067	getTriple().getArch() == llvm::Triple::armeb \|\|
2068	getTriple().getArch() == llvm::Triple::thumb \|\|	2068	getTriple().getArch() == llvm::Triple::thumb \|\|
2069	getTriple().getArch() == llvm::Triple::thumbeb \|\|	2069	getTriple().getArch() == llvm::Triple::thumbeb \|\|
		2070	getTriple().getArch() == llvm::Triple::mips64 \|\|
2070	getTriple().getArch() == llvm::Triple::ppc \|\|	2071	getTriple().getArch() == llvm::Triple::ppc \|\|
2071	getTriple().getArch() == llvm::Triple::ppc64 \|\|	2072	getTriple().getArch() == llvm::Triple::ppc64 \|\|
2072	getTriple().getArch() == llvm::Triple::ppc64le \|\|	2073	getTriple().getArch() == llvm::Triple::ppc64le \|\|
Lines 2438-2444 Link Here
2438	// When targeting 32-bit platforms, look for '/usr/lib32/crt1.o' and fall	2439	// When targeting 32-bit platforms, look for '/usr/lib32/crt1.o' and fall
2439	// back to '/usr/lib' if it doesn't exist.	2440	// back to '/usr/lib' if it doesn't exist.
2440	if ((Triple.getArch() == llvm::Triple::x86 \|\|	2441	if ((Triple.getArch() == llvm::Triple::x86 \|\|
2441	Triple.getArch() == llvm::Triple::ppc) &&	2442	Triple.getArch() == llvm::Triple::ppc \|\|
		2443	Triple.getArch() == llvm::Triple::mips) &&
2442	llvm::sys::fs::exists(getDriver().SysRoot + "/usr/lib32/crt1.o"))	2444	llvm::sys::fs::exists(getDriver().SysRoot + "/usr/lib32/crt1.o"))
2443	getFilePaths().push_back(getDriver().SysRoot + "/usr/lib32");	2445	getFilePaths().push_back(getDriver().SysRoot + "/usr/lib32");
2444	else	2446	else