[cfe-commits] r52417 - /cfe/trunk/utils/ccc

[Nuno Lopes]

Author: nlopes
Date: Tue Jun 17 12:23:14 2008
New Revision: 52417

URL: http://llvm.org/viewvc/llvm-project?rev=52417&view=rev
Log:
handle -arch and -isysroot correctly (like ccc-analyszer do).
Patch by Filipe Cabecinhas

Modified:
    cfe/trunk/utils/ccc

Modified: cfe/trunk/utils/ccc
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/ccc?rev=52417&r1=52416&r2=52417&view=diff

==============================================================================
--- cfe/trunk/utils/ccc (original)
+++ cfe/trunk/utils/ccc Tue Jun 17 12:23:14 2008
@@ -111,10 +111,26 @@
         if arg[:5] in ['-std=']:
             compile_opts.append(arg)
 
+        # Options with one argument that should pass through to compiler
+        if arg in [ '-include', '-idirafter', '-iprefix',
+                    '-iquote', '-isystem', '-iwithprefix',
+                    '-iwithprefixbefore']:
+            compile_opts.append(arg)
+            compile_opts.append(args[i+1])
+            i += 1
+
         # Options with one argument that should pass through
-        if arg in ['-include', '-isysroot', '-arch']:
+        if arg in ['-framework']:
+            link_opts.append(arg)
+            link_opts.append(args[i+1])
+            i += 1
+
+        # Options with one argument that should pass through to both
+        if arg in ['-isysroot', '-arch']:
             compile_opts.append(arg)
             compile_opts.append(args[i+1])
+            link_opts.append(arg)
+            link_opts.append(args[i+1])
             i += 1
 
         # Prefix matches for the link mode
@@ -123,12 +139,6 @@
             if arg == '-Os': arg = '-O2'
             link_opts.append(arg)
 
-        # Options with one argument that should pass through
-        if arg in ['-framework', '-isysroot', '-arch']:
-            link_opts.append(arg)
-            link_opts.append(args[i+1])
-            i += 1
-
         # Input files
         if arg == '-filelist':
             f = open(args[i+1])