Merge 06d8076 into 10e3482

clade/extensions/opts.py

@@ -491,6 +491,7 @@
     "-isystem",
     "-idirafter",
     "-imacros",
+    "-isysroot"
 ]
 
 gcc_optimization_opts = [
@@ -519,6 +520,11 @@ def filter_opts(opts, get_storage_path=None):
         return []
 
     filtered_opts = []
+
+    # Do not overwrite absolute paths within options except for the one corresponding to isysroot when this option is
+    # specified.
+    is_isysroot = any(opt.startswith('-isysroot') for opt in opts)
+
     opts = iter(opts)
     for opt in opts:
         if not s_regex.match(opt):
@@ -534,18 +540,19 @@ def filter_opts(opts, get_storage_path=None):
 
             continue
 
+        name = m.group(1)
         path = m.group(2)
 
         if path:
-            if get_storage_path and os.path.isabs(path):
+            if (not is_isysroot and get_storage_path and os.path.isabs(path)) or (is_isysroot and name == '-isysroot'):
                 opt = opt.replace(path, get_storage_path(path))
 
             filtered_opts.append(opt)
         elif opt in requires_value["CC"]:
             filtered_opts.append(opt)
             path = next(opts)
 
-            if get_storage_path and os.path.isabs(path):
+            if (not is_isysroot and get_storage_path and os.path.isabs(path)) or (is_isysroot and name == '-isysroot'):
                 path = get_storage_path(path)
 
             filtered_opts.append(path)