Author: Jonas Devlieghere Date: 2021-04-20T20:42:50-07:00 New Revision: 05eeed9691aeb3e0316712195b998e9078cdceb0
URL: https://github.com/llvm/llvm-project/commit/05eeed9691aeb3e0316712195b998e9078cdceb0 DIFF: https://github.com/llvm/llvm-project/commit/05eeed9691aeb3e0316712195b998e9078cdceb0.diff LOG: Revert "[Driver] Support default libc++ library location on Darwin" This reverts the following commits because it breaks TestAppleSimulatorOSType.py on GreenDragon [1]. caff17e503fe81d69e90dd69b14f5149659f9db4 f5efe0aa048b2bd3363b3a53efe9ae7367244801 ae8b2cab67408a043a4fe964d16e4803553c4ee0 [1] http://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/31346/ 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 06d4f2f4df0bc..bc59b6beafc78 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 9fe68f1821c96..15e5d100afcbc 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