Author: Fangrui Song Date: 2021-03-23T23:12:19-07:00 New Revision: 0361e649759f90046f8f261365df488dc6f68342
URL: https://github.com/llvm/llvm-project/commit/0361e649759f90046f8f261365df488dc6f68342 DIFF: https://github.com/llvm/llvm-project/commit/0361e649759f90046f8f261365df488dc6f68342.diff LOG: [Driver] Gnu.cpp: remove unneeded getMultiarchTriple normalization Added: Modified: clang/lib/Driver/ToolChains/Gnu.cpp Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index f2106a8c09f3..6a612b83c4f6 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -3011,15 +3011,11 @@ Generic_GCC::addGCCLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, StringRef InstallDir = GCCInstallation.getInstallPath(); StringRef TripleStr = GCCInstallation.getTriple().str(); const Multilib &Multilib = GCCInstallation.getMultilib(); - const std::string Triple = getMultiarchTriple( - getDriver(), GCCInstallation.getTriple(), getDriver().SysRoot); - const std::string TargetMultiarchTriple = - getMultiarchTriple(getDriver(), getTriple(), getDriver().SysRoot); const GCCVersion &Version = GCCInstallation.getVersion(); // Try /../$triple/include/c++/$version then /../include/c++/$version. if (addLibStdCXXIncludePaths( - LibDir.str() + "/../" + Triple + "/include/c++/" + Version.Text, + LibDir.str() + "/../" + TripleStr + "/include/c++/" + Version.Text, TripleStr, Multilib.includeSuffix(), DriverArgs, CC1Args)) return true; // Detect Debian g++-multiarch-incdir. diff . _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
