Author: Petr Hosek Date: 2021-04-22T14:04:24-07:00 New Revision: d5f433d3302eedd455889d581d8312715289b582
URL: https://github.com/llvm/llvm-project/commit/d5f433d3302eedd455889d581d8312715289b582 DIFF: https://github.com/llvm/llvm-project/commit/d5f433d3302eedd455889d581d8312715289b582.diff LOG: Revert "Re-land "[Driver] Support default libc++ library location on Darwin"" This reverts commit 6331680ad2ad000fdaf7e72f3c1880c7908ffa25 because this breaks the compiler-rt build. Added: Modified: clang/lib/Driver/ToolChains/Darwin.cpp clang/test/Driver/darwin-ld.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index 06d4f2f4df0b..bc59b6beafc7 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -615,8 +615,6 @@ void darwin::Linker::ConstructJob(Compilation &C, const JobAction &JA, Args.AddAllArgs(CmdArgs, options::OPT_L); - getToolChain().AddFilePathLibArgs(Args, CmdArgs); - AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA); // Build the input file for -filelist (list of linker input files) in case we // need it later @@ -804,7 +802,6 @@ MachO::MachO(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) getProgramPaths().push_back(getDriver().getInstalledDir()); if (getDriver().getInstalledDir() != getDriver().Dir) getProgramPaths().push_back(getDriver().Dir); - getFilePaths().push_back(getDriver().Dir + "/../lib"); } /// Darwin - Darwin tool chain for i386 and x86_64. diff --git a/clang/test/Driver/darwin-ld.c b/clang/test/Driver/darwin-ld.c index 9fe68f1821c9..15e5d100afcb 100644 --- a/clang/test/Driver/darwin-ld.c +++ b/clang/test/Driver/darwin-ld.c @@ -365,7 +365,3 @@ // RUN: FileCheck -check-prefix=MNO_OUTLINE %s < %t.log // MNO_OUTLINE: {{ld(.exe)?"}} // MNO_OUTLINE-SAME: "-mllvm" "-enable-machine-outliner=never" - -// RUN: %clang -target x86_64-apple-darwin10 -### %t.o 2> %t.log -// RUN: FileCheck -check-prefix=INSTALL-DIR %s < %t.log -// INSTALL-DIR: "-L{{.*}}{{/|\\\\}}..{{/|\\\\}}lib" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
