rsc: fix how -isystem args are filtered out for the preproc

Change-Id: I7688f3d68be99362e79304bbac041424eee6347a

2 files changed, 18 insertions, 13 deletions

diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index 7c7cc3288dea..7c926f04d7a5 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -75,6 +75,23 @@ static bool CallPrePro( const OString& rInput,
             bVerbose = true;
             continue;
         }
+        if (strcmp(static_cast<char *>(pCmdLine->GetEntry(i)), "-isystem") == 0)
+        {
+            // ignore "-isystem" and following arg
+            if (i < int(pCmdLine->GetCount()) - 1)
+            {
+                ++i;
+            }
+            continue;
+        }
+        if (strncmp(
+                static_cast<char *>(pCmdLine->GetEntry(i)), "-isystem",
+                strlen("-isystem"))
+            == 0)
+        {
+            // ignore args starting with "-isystem"
+            continue;
+        }
         if ( !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-u", 2 ) ||
              !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-i", 2 ) ||
              !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-d", 2 ))
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index 023616495d9c..287b2a583d88 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -217,19 +217,7 @@ dooptions(int argc, char** argv)
         for (i = j = 1; i < argc; i++) {
             arg = ap = argv[i];
 
-            if (strcmp(arg, "-isystem") == 0)
-            {
-                // ignore "-isystem" and following arg
-                if (i < argc)
-                {
-                    ++i;
-                }
-            }
-            else if (strncmp(arg, "-isystem", strlen("-isystem")) == 0)
-            {
-                // ignore args starting with "-isystem"
-            }
-            else if (*ap++ != '-' || *ap == EOS)
+            if (*ap++ != '-' || *ap == EOS)
             {
                     argv[j++] = argv[i];
             }