Skip to content

Commit a879ee4

Browse files
committed
Fixed the '-xc' thing, plus ditched the old WLLVM_OUTPUT env var.
1 parent 19ba967 commit a879ee4

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

wllvm/arglistfilter.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,14 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
124124
# Language
125125
'-ansi' : (0, ArgumentListFilter.compileUnaryCallback),
126126
'-pedantic' : (0, ArgumentListFilter.compileUnaryCallback),
127+
#iam: i notice that yices configure passes -xc so
128+
# we should have a fall back pattern that captures the case
129+
# when there is no space between the x and the langauge.
130+
# for what its worth: the manual says the language can be one of
131+
# c objective-c c++ c-header cpp-output c++-cpp-output
132+
# assembler assembler-with-cpp
133+
# BD: care to comment on your configure?
134+
127135
'-x' : (1, ArgumentListFilter.compileBinaryCallback),
128136

129137
# Debug
@@ -237,6 +245,8 @@ def __init__(self, inputList, exactMatches={}, patternMatches={}):
237245
r'^--sysroot=.+$' : (0, ArgumentListFilter.compileUnaryCallback),
238246
r'^-print-prog-name=.*$' : (0, ArgumentListFilter.compileUnaryCallback),
239247
r'^-print-file-name=.*$' : (0, ArgumentListFilter.compileUnaryCallback),
248+
#iam: -xc from yices. why BD?
249+
r'^-x.+$' : (0, ArgumentListFilter.compileUnaryCallback),
240250

241251
}
242252

wllvm/logconfig.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ def logConfig(name):
2121

2222

2323
if destination:
24-
sys.stderr.write("logging to {0}\n".format(destination))
2524
logging.basicConfig(filename=destination, level=logging.WARNING, format='%(levelname)s:%(message)s')
2625
else:
2726
logging.basicConfig(level=logging.WARNING, format='%(levelname)s:%(message)s')
@@ -31,8 +30,6 @@ def logConfig(name):
3130
# ignore old setting
3231
level = os.getenv(_loggingEnvLevel_new)
3332

34-
sys.stderr.write("logging level set to to {0}\n".format(level))
35-
3633
if level:
3734
level = level.upper()
3835
if not level in _validLogLevels:

0 commit comments

Comments
 (0)