Mercurial > vanilla

comparison dev/clang/patch-musl.patch @ 766:e91fbcb3d1ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vanilla: consolidate FHS
author David Demelier <markand@malikania.fr>
date Fri, 09 Aug 2019 20:10:00 +0200
parents
children
comparison
equal deleted inserted replaced
765:859f76ffb512 766:e91fbcb3d1ef
1 --- lib/Driver/ToolChains/Linux.cpp.orig 2019-08-08 15:11:01.916922289 +0200
2 +++ lib/Driver/ToolChains/Linux.cpp 2019-08-08 15:12:53.132925706 +0200
3 @@ -659,11 +659,11 @@
4 if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
5 addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
6
7 - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
8 - SmallString<128> P(D.ResourceDir);
9 - llvm::sys::path::append(P, "include");
10 - addSystemInclude(DriverArgs, CC1Args, P);
11 - }
12 + SmallString<128> ResourceDirInclude(D.ResourceDir);
13 + llvm::sys::path::append(ResourceDirInclude, "include");
14 + if (!DriverArgs.hasArg(options::OPT_nobuiltininc) &&
15 + (!getTriple().isMusl() || DriverArgs.hasArg(options::OPT_nostdlibinc)))
16 + addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
17
18 if (DriverArgs.hasArg(options::OPT_nostdlibinc))
19 return;
20 @@ -861,6 +861,9 @@
21 addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
22
23 addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
24 +
25 + if (!DriverArgs.hasArg(options::OPT_nobuiltininc) && getTriple().isMusl())
26 + addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
27 }
28
29 static std::string DetectLibcxxIncludePath(StringRef base) {