File bcc-bsc1173299-fix-include-paths.patch of Package bcc

Overview Repositories Revisions Requests Users Attributes Meta

File bcc-bsc1173299-fix-include-paths.patch of Package bcc

diff --git a/src/cc/frontends/clang/kbuild_helper.cc b/src/cc/frontends/clang/kbuild_helper.cc
index 0c0f58d..781b2b2 100644
--- a/src/cc/frontends/clang/kbuild_helper.cc
+++ b/src/cc/frontends/clang/kbuild_helper.cc
@@ -63,24 +63,33 @@ int KBuildHelper::get_flags(const char *uname_machine, vector<string> *cflags) {
   // some module build directories split headers between source/ and build/
   if (has_source_dir_) {
     cflags->push_back("-I" + kdir_ + "/build/arch/"+arch+"/include");
-    cflags->push_back("-I" + kdir_ + "/build/arch/"+arch+"/include/generated/uapi");
-    cflags->push_back("-I" + kdir_ + "/build/arch/"+arch+"/include/generated");
     cflags->push_back("-I" + kdir_ + "/build/include");
     cflags->push_back("-I" + kdir_ + "/build/./arch/"+arch+"/include/uapi");
-    cflags->push_back("-I" + kdir_ + "/build/arch/"+arch+"/include/generated/uapi");
     cflags->push_back("-I" + kdir_ + "/build/include/uapi");
-    cflags->push_back("-I" + kdir_ + "/build/include/generated");
-    cflags->push_back("-I" + kdir_ + "/build/include/generated/uapi");
   }
 
   cflags->push_back("-I./arch/"+arch+"/include");
-  cflags->push_back("-Iarch/"+arch+"/include/generated/uapi");
-  cflags->push_back("-Iarch/"+arch+"/include/generated");
+  if (has_source_dir_) {
+    cflags->push_back("-I" + kdir_ + "/build/arch/"+arch+"/include/generated/uapi");
+    cflags->push_back("-I" + kdir_ + "/build/arch/"+arch+"/include/generated");
+  } else {
+    cflags->push_back("-Iarch/"+arch+"/include/generated/uapi");
+    cflags->push_back("-Iarch/"+arch+"/include/generated");
+  }
   cflags->push_back("-Iinclude");
   cflags->push_back("-I./arch/"+arch+"/include/uapi");
-  cflags->push_back("-Iarch/"+arch+"/include/generated/uapi");
+  if (has_source_dir_) {
+    cflags->push_back("-I" + kdir_ + "/build/arch/"+arch+"/include/generated/uapi");
+  } else {
+    cflags->push_back("-Iarch/"+arch+"/include/generated/uapi");
+  }
   cflags->push_back("-I./include/uapi");
-  cflags->push_back("-Iinclude/generated/uapi");
+  if (has_source_dir_) {
+    cflags->push_back("-I" + kdir_ + "/build/include/generated");
+    cflags->push_back("-I" + kdir_ + "/build/include/generated/uapi");
+  } else {
+    cflags->push_back("-Iinclude/generated/uapi");
+  }
   cflags->push_back("-include");
   cflags->push_back("./include/linux/kconfig.h");
   cflags->push_back("-D__KERNEL__");

Places

File bcc-bsc1173299-fix-include-paths.patch of Package bcc

Places