[ACLiC] Handle -isysroot.

root-project · Oct 2, 2018 · c75c736 · c75c736
1 parent b9f9e5c
commit c75c736
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/core/base/src/TSystem.cxx b/core/base/src/TSystem.cxx
@@ -2922,6 +2922,16 @@ int TSystem::CompileMacro(const char *filename, Option_t *opt,
       incPath.Append(fromConfig);
    }
    incPath.ReplaceAll(" -I",":");       // of form :dir1 :dir2:dir3
+   auto posISysRoot = incPath.Index(" -isysroot \"");
+   if (posISysRoot != kNPOS) {
+      auto posISysRootEnd = incPath.Index('"', posISysRoot + 12);
+      if (posISysRootEnd != kNPOS) {
+         // NOTE: should probably just skip isysroot for dependency analysis.
+         // (And will, in the future - once we rely on compiler-generated .d files.)
+         incPath.Insert(posISysRootEnd - 1, "/usr/include/");
+         incPath.Replace(posISysRoot, 12, ":\"");
+      }
+   }
    while ( incPath.Index(" :") != -1 ) {
       incPath.ReplaceAll(" :",":");
    }