Mercurial > vanilla

annotate dev/clang/patch-musl.patch @ 880:ca564485d3c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
emulation/libretro-prosystem: initial import, closes #2176
author David Demelier <markand@malikania.fr>
date Sun, 25 Aug 2019 13:47:10 +0200
parents e91fbcb3d1ef
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
766
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 --- lib/Driver/ToolChains/Linux.cpp.orig 2019-08-08 15:11:01.916922289 +0200
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 +++ lib/Driver/ToolChains/Linux.cpp 2019-08-08 15:12:53.132925706 +0200
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 @@ -659,11 +659,11 @@
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
6
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 - SmallString<128> P(D.ResourceDir);
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 - llvm::sys::path::append(P, "include");
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 - addSystemInclude(DriverArgs, CC1Args, P);
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 - }
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 + SmallString<128> ResourceDirInclude(D.ResourceDir);
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 + llvm::sys::path::append(ResourceDirInclude, "include");
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 + if (!DriverArgs.hasArg(options::OPT_nobuiltininc) &&
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 + (!getTriple().isMusl() || DriverArgs.hasArg(options::OPT_nostdlibinc)))
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 + addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
17
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 if (DriverArgs.hasArg(options::OPT_nostdlibinc))
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 return;
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 @@ -861,6 +861,9 @@
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
22
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 +
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 + if (!DriverArgs.hasArg(options::OPT_nobuiltininc) && getTriple().isMusl())
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 + addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 }
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
28
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 static std::string DetectLibcxxIncludePath(StringRef base) {