summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Thorne <TafThorne@GoogleMail.com>2016-10-13 13:53:25 +0100
committerGitHub <noreply@github.com>2016-10-13 13:53:25 +0100
commit6f886a5a13cbe1a9529595194420d717c6c53fc2 (patch)
tree244cc1f4448537f941f03f46eb19ac7876d2015e
parent87f21f9a945fd8d14987d9eb10a2d999644fe8f1 (diff)
parent70f9e762a2c257a8aa95f4382e9a22c502211381 (diff)
downloaddistcc-git-6f886a5a13cbe1a9529595194420d717c6c53fc2.tar.gz
Merge pull request #198 from dabrahams/patch-1
Handle arguments -target & -F These arguments are needed to build Swift on MacOS. "-F" introduces a "framework path." A framework is a bundle of related libraries (usually one) and headers under a single directory. Adding a framework path effectively adds all of its */Headers directories to the -I #include path.
-rwxr-xr-xinclude_server/parse_command.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/include_server/parse_command.py b/include_server/parse_command.py
index cb9652e..050d00f 100755
--- a/include_server/parse_command.py
+++ b/include_server/parse_command.py
@@ -24,6 +24,7 @@ __author__ = "opensource@google.com (Craig Silverstein, Nils Klarlund)"
import re
import os
import sys
+import glob
import basics
import cache_basics
@@ -99,6 +100,7 @@ CPP_OPTIONS_MAYBE_TWO_WORDS = {
'-MT': lambda ps, arg: None,
'-MQ': lambda ps, arg: None,
'-arch': lambda ps, arg: None,
+ '-target': lambda ps, arg: None,
'-include': lambda ps, arg: ps.include_files.append(arg),
'-imacros': lambda ps, arg: ps.include_files.append(arg),
'-idirafter': lambda ps, arg: ps.after_system_dirs.append(arg),
@@ -179,6 +181,7 @@ CPP_OPTIONS_ONE_LETTER = {
# preprocessor-related, they are all noops.
'A': lambda ps, arg: None,
'l': lambda ps, arg: None,
+ 'F': lambda ps, arg: ps.i_dirs.extend(glob.glob(os.path.join(arg,'*', 'Headers'))),
'u': lambda ps, arg: None,
'L': lambda ps, arg: None,
'B': lambda ps, arg: None,