diff options
| -rw-r--r-- | include/clang/Driver/CC1Options.td | 6 | ||||
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 10 | ||||
| -rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 11 | ||||
| -rw-r--r-- | test/lit.cfg | 3 |
4 files changed, 6 insertions, 24 deletions
diff --git a/include/clang/Driver/CC1Options.td b/include/clang/Driver/CC1Options.td index cc41110a09..e8d06f994f 100644 --- a/include/clang/Driver/CC1Options.td +++ b/include/clang/Driver/CC1Options.td @@ -670,12 +670,6 @@ def internal_externc_isystem : JoinedOrSeparate<"-internal-externc-isystem">, "implicit extern \"C\" semantics; these are assumed to not be " "user-provided and are used to model system and standard headers' " "paths.">; -def internal_nosysroot_isystem : JoinedOrSeparate<"-internal-nosysroot-isystem">, - MetaVarName<"<directory>">, - HelpText<"Add directory to the internal system include search path without " - "applying a sysroot to it; these are assumed to not be " - "user-provided and are used to model system and standard headers' " - "paths.">; def iprefix : JoinedOrSeparate<"-iprefix">, MetaVarName<"<prefix>">, HelpText<"Set the -iwithprefix/-iwithprefixbefore prefix">; def iwithprefix : JoinedOrSeparate<"-iwithprefix">, MetaVarName<"<dir>">, diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 9b84966d81..d787ee08e8 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -1920,12 +1920,9 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs, addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - // Ignore the sysroot, we *always* look for clang headers relative to - // supplied path. llvm::sys::Path P(D.ResourceDir); P.appendComponent("include"); - CC1Args.push_back("-internal-nosysroot-isystem"); - CC1Args.push_back(DriverArgs.MakeArgString(P.str())); + addSystemInclude(DriverArgs, CC1Args, P.str()); } if (DriverArgs.hasArg(options::OPT_nostdlibinc)) @@ -2381,12 +2378,9 @@ void Windows::AddClangSystemIncludeArgs(const ArgList &DriverArgs, return; if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - // Ignore the sysroot, we *always* look for clang headers relative to - // supplied path. llvm::sys::Path P(getDriver().ResourceDir); P.appendComponent("include"); - CC1Args.push_back("-internal-nosysroot-isystem"); - CC1Args.push_back(DriverArgs.MakeArgString(P.str())); + addSystemInclude(DriverArgs, CC1Args, P.str()); } if (DriverArgs.hasArg(options::OPT_nostdlibinc)) diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 1bcad24ee4..c247e21737 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -577,9 +577,7 @@ static void HeaderSearchOptsToArgs(const HeaderSearchOptions &Opts, } else { if (E.IsInternal) { assert(E.Group == frontend::System && "Unexpected header search group"); - if (E.IgnoreSysRoot) - Res.push_back("-internal-nosysroot-isystem"); - else if (E.ImplicitExternC) + if (E.ImplicitExternC) Res.push_back("-internal-externc-isystem"); else Res.push_back("-internal-isystem"); @@ -1496,14 +1494,11 @@ static void ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args) { // Add the internal paths from a driver that detects standard include paths. for (arg_iterator I = Args.filtered_begin(OPT_internal_isystem, - OPT_internal_externc_isystem, - OPT_internal_nosysroot_isystem), + OPT_internal_externc_isystem), E = Args.filtered_end(); I != E; ++I) Opts.AddPath((*I)->getValue(Args), frontend::System, - false, false, - (*I)->getOption().matches(OPT_internal_nosysroot_isystem), - /*IsInternal=*/true, + false, false, /*IgnoreSysRoot=*/true, /*IsInternal=*/true, (*I)->getOption().matches(OPT_internal_externc_isystem)); } diff --git a/test/lit.cfg b/test/lit.cfg index 2422ad0903..1f4a8452b0 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -157,8 +157,7 @@ def getClangBuiltinIncludeDir(clang): lit.fatal("Couldn't find the include dir for Clang ('%s')" % clang) return cmd.stdout.read().strip() -config.substitutions.append( ('%clang_cc1', - '%s -cc1 -internal-nosysroot-isystem %s' +config.substitutions.append( ('%clang_cc1', '%s -cc1 -internal-isystem %s' % (config.clang, getClangBuiltinIncludeDir(config.clang))) ) |