Index: contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp =================================================================== --- contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp (revision 278161) +++ contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp (working copy) @@ -2067,6 +2067,7 @@ getTriple().getArch() == llvm::Triple::armeb || getTriple().getArch() == llvm::Triple::thumb || getTriple().getArch() == llvm::Triple::thumbeb || + getTriple().getArch() == llvm::Triple::mips64 || getTriple().getArch() == llvm::Triple::ppc || getTriple().getArch() == llvm::Triple::ppc64 || getTriple().getArch() == llvm::Triple::ppc64le || @@ -2438,7 +2439,8 @@ // When targeting 32-bit platforms, look for '/usr/lib32/crt1.o' and fall // back to '/usr/lib' if it doesn't exist. if ((Triple.getArch() == llvm::Triple::x86 || - Triple.getArch() == llvm::Triple::ppc) && + Triple.getArch() == llvm::Triple::ppc || + Triple.getArch() == llvm::Triple::mips) && llvm::sys::fs::exists(getDriver().SysRoot + "/usr/lib32/crt1.o")) getFilePaths().push_back(getDriver().SysRoot + "/usr/lib32"); else Index: share/mk/src.opts.mk =================================================================== --- share/mk/src.opts.mk (revision 278161) +++ share/mk/src.opts.mk (working copy) @@ -204,7 +204,7 @@ # If the compiler is not C++11 capable, disable clang and use gcc instead. __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX __DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC -.elif ${__T} == "amd64" || ${__T} == "i386" +.elif ${__T} == "amd64" || ${__T} == "i386" || ${__T} == "mips64" # On x86, clang is enabled, and will be installed as the default cc. __DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX