Mercurial > vanilla

diff 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
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/clang/patch-musl.patch	Fri Aug 09 20:10:00 2019 +0200
@@ -0,0 +1,29 @@
+--- lib/Driver/ToolChains/Linux.cpp.orig	2019-08-08 15:11:01.916922289 +0200
++++ lib/Driver/ToolChains/Linux.cpp	2019-08-08 15:12:53.132925706 +0200
+@@ -659,11 +659,11 @@
+   if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
+     addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
+ 
+-  if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
+-    SmallString<128> P(D.ResourceDir);
+-    llvm::sys::path::append(P, "include");
+-    addSystemInclude(DriverArgs, CC1Args, P);
+-  }
++  SmallString<128> ResourceDirInclude(D.ResourceDir);
++  llvm::sys::path::append(ResourceDirInclude, "include");
++  if (!DriverArgs.hasArg(options::OPT_nobuiltininc) &&
++      (!getTriple().isMusl() || DriverArgs.hasArg(options::OPT_nostdlibinc)))
++    addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
+ 
+   if (DriverArgs.hasArg(options::OPT_nostdlibinc))
+     return;
+@@ -861,6 +861,9 @@
+   addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
+ 
+   addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
++
++  if (!DriverArgs.hasArg(options::OPT_nobuiltininc) && getTriple().isMusl())
++    addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
+ }
+ 
+ static std::string DetectLibcxxIncludePath(StringRef base) {