Author: smeenai Date: Mon Aug 5 23:48:43 2019 New Revision: 367982 URL: http://llvm.org/viewvc/llvm-project?rev=367982&view=rev Log: [Driver] Introduce -stdlib++-isystem
There are times when we wish to explicitly control the C++ standard library search paths used by the driver. For example, when we're building against the Android NDK, we might want to use the NDK's C++ headers (which have a custom inline namespace) even if we have C++ headers installed next to the driver. We might also be building against a non-standard directory layout and wanting to specify the C++ standard library include directories explicitly. We could accomplish this by passing -nostdinc++ and adding an explicit -isystem for our custom search directories. However, users of our toolchain may themselves want to use -nostdinc++ and a custom C++ search path (libc++'s build does this, for example), and our added -isystem won't respect the -nostdinc++, leading to multiple C++ header directories on the search path, which causes build failures. Add a new driver option -stdlib++-isystem to support this use case. Passing this option suppresses adding the default C++ library include paths in the driver, and it also respects -nostdinc++ to allow users to still override the C++ library paths themselves. It's a bit unfortunate that we end up with both -stdlib++-isystem and -cxx-isystem, but their semantics differ significantly. -cxx-isystem is unaffected by -nostdinc++ and is added to the end of the search path (which is not appropriate for C++ standard library headers, since they often #include_next into other system headers), while -stdlib++-isystem respects -nostdinc++, is added to the beginning of the search path, and suppresses the default C++ library include paths. Differential Revision: https://reviews.llvm.org/D64089 Added: cfe/trunk/test/Driver/stdlibxx-isystem.cpp Modified: cfe/trunk/include/clang/Driver/Options.td cfe/trunk/include/clang/Driver/ToolChain.h cfe/trunk/lib/Driver/ToolChain.cpp cfe/trunk/lib/Driver/ToolChains/Clang.cpp Modified: cfe/trunk/include/clang/Driver/Options.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=367982&r1=367981&r2=367982&view=diff ============================================================================== --- cfe/trunk/include/clang/Driver/Options.td (original) +++ cfe/trunk/include/clang/Driver/Options.td Mon Aug 5 23:48:43 2019 @@ -2642,6 +2642,10 @@ def std_EQ : Joined<["-", "--"], "std="> }]>; def stdlib_EQ : Joined<["-", "--"], "stdlib=">, Flags<[CC1Option]>, HelpText<"C++ standard library to use">, Values<"libc++,libstdc++,platform">; +def stdlibxx_isystem : JoinedOrSeparate<["-"], "stdlib++-isystem">, + Group<clang_i_Group>, + HelpText<"Use directory as the C++ standard library include path">, + Flags<[DriverOption]>, MetaVarName<"<directory>">; def unwindlib_EQ : Joined<["-", "--"], "unwindlib=">, Flags<[CC1Option]>, HelpText<"Unwind library to use">, Values<"libgcc,unwindlib,platform">; def sub__library : JoinedOrSeparate<["-"], "sub_library">; Modified: cfe/trunk/include/clang/Driver/ToolChain.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/ToolChain.h?rev=367982&r1=367981&r2=367982&view=diff ============================================================================== --- cfe/trunk/include/clang/Driver/ToolChain.h (original) +++ cfe/trunk/include/clang/Driver/ToolChain.h Mon Aug 5 23:48:43 2019 @@ -542,6 +542,11 @@ public: AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const; + /// AddClangCXXStdlibIsystemArgs - Add the clang -cc1 level arguments to set + /// the specified include paths for the C++ standard library. + void AddClangCXXStdlibIsystemArgs(const llvm::opt::ArgList &DriverArgs, + llvm::opt::ArgStringList &CC1Args) const; + /// Returns if the C++ standard library should be linked in. /// Note that e.g. -lm should still be linked even if this returns false. bool ShouldLinkCXXStdlib(const llvm::opt::ArgList &Args) const; Modified: cfe/trunk/lib/Driver/ToolChain.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChain.cpp?rev=367982&r1=367981&r2=367982&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChain.cpp (original) +++ cfe/trunk/lib/Driver/ToolChain.cpp Mon Aug 5 23:48:43 2019 @@ -832,6 +832,16 @@ void ToolChain::AddClangCXXStdlibInclude DriverArgs.AddAllArgs(CC1Args, options::OPT_stdlib_EQ); } +void ToolChain::AddClangCXXStdlibIsystemArgs( + const llvm::opt::ArgList &DriverArgs, + llvm::opt::ArgStringList &CC1Args) const { + DriverArgs.ClaimAllArgs(options::OPT_stdlibxx_isystem); + if (!DriverArgs.hasArg(options::OPT_nostdincxx)) + for (const auto &P : + DriverArgs.getAllArgValues(options::OPT_stdlibxx_isystem)) + addSystemInclude(DriverArgs, CC1Args, P); +} + bool ToolChain::ShouldLinkCXXStdlib(const llvm::opt::ArgList &Args) const { return getDriver().CCCIsCXX() && !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs, Modified: cfe/trunk/lib/Driver/ToolChains/Clang.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=367982&r1=367981&r2=367982&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains/Clang.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains/Clang.cpp Mon Aug 5 23:48:43 2019 @@ -1235,6 +1235,9 @@ void Clang::AddPreprocessingOptions(Comp // Do not claim the argument so that the use of the argument does not // silently go unnoticed on toolchains which do not honour the option. continue; + } else if (A->getOption().matches(options::OPT_stdlibxx_isystem)) { + // Translated to -internal-isystem by the driver, no need to pass to cc1. + continue; } // Not translated, render as usual. @@ -1289,11 +1292,15 @@ void Clang::AddPreprocessingOptions(Comp // of an offloading programming model. // Add C++ include arguments, if needed. - if (types::isCXX(Inputs[0].getType())) - forAllAssociatedToolChains(C, JA, getToolChain(), - [&Args, &CmdArgs](const ToolChain &TC) { - TC.AddClangCXXStdlibIncludeArgs(Args, CmdArgs); - }); + if (types::isCXX(Inputs[0].getType())) { + bool HasStdlibxxIsystem = Args.hasArg(options::OPT_stdlibxx_isystem); + forAllAssociatedToolChains( + C, JA, getToolChain(), + [&Args, &CmdArgs, HasStdlibxxIsystem](const ToolChain &TC) { + HasStdlibxxIsystem ? TC.AddClangCXXStdlibIsystemArgs(Args, CmdArgs) + : TC.AddClangCXXStdlibIncludeArgs(Args, CmdArgs); + }); + } // Add system include arguments for all targets but IAMCU. if (!IsIAMCU) Added: cfe/trunk/test/Driver/stdlibxx-isystem.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/stdlibxx-isystem.cpp?rev=367982&view=auto ============================================================================== --- cfe/trunk/test/Driver/stdlibxx-isystem.cpp (added) +++ cfe/trunk/test/Driver/stdlibxx-isystem.cpp Mon Aug 5 23:48:43 2019 @@ -0,0 +1,53 @@ +// Backslash escaping makes matching against the installation directory fail on +// Windows. Temporarily disable the test there until we add an option to print +// the installation directory unescaped. +// UNSUPPORTED: system-windows + +// By default, we should search for libc++ next to the driver. +// RUN: mkdir -p %t/bin +// RUN: mkdir -p %t/include/c++/v1 +// RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \ +// RUN: -stdlib=libc++ -fsyntax-only %s -### 2>&1 | \ +// RUN: FileCheck -check-prefix=LIBCXX %s +// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \ +// RUN: -stdlib=libc++ -fsyntax-only %s -### 2>&1 | \ +// RUN: FileCheck -check-prefix=LIBCXX %s +// LIBCXX: InstalledDir: [[INSTALLDIR:.+$]] +// LIBCXX: "-internal-isystem" "[[INSTALLDIR]]/../include/c++/v1" + +// Passing -stdlib++-isystem should suppress the default search. +// RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \ +// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \ +// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=NODEFAULT %s +// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \ +// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \ +// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=NODEFAULT %s +// NODEFAULT: InstalledDir: [[INSTALLDIR:.+$]] +// NODEFAULT-NOT: "-internal-isystem" "[[INSTALLDIR]]/../include/c++/v1" + +// And we should add it as an -internal-isystem. +// RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \ +// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \ +// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=INCPATH %s +// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \ +// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \ +// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=INCPATH %s +// INCPATH: "-internal-isystem" "/tmp/foo" "-internal-isystem" "/tmp/bar" + +// We shouldn't pass the -stdlib++-isystem to cc1. +// RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \ +// RUN: -stdlib++-isystem /tmp -stdlib=libc++ -fsyntax-only %s -### 2>&1 | \ +// RUN: FileCheck -check-prefix=NOCC1 %s +// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \ +// RUN: -stdlib++-isystem /tmp -stdlib=libc++ -fsyntax-only %s -### 2>&1 | \ +// RUN: FileCheck -check-prefix=NOCC1 %s +// NOCC1-NOT: "-stdlib++-isystem" "/tmp" + +// It should respect -nostdinc++. +// RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \ +// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -nostdinc++ \ +// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=NOSTDINCXX %s +// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \ +// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -nostdinc++ \ +// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=NOSTDINCXX %s +// NOSTDINCXX-NOT: "-internal-isystem" "/tmp/foo" "-internal-isystem" "/tmp/bar" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
