Skip to content

Commit e60ce24

Browse files
committed
Reviving @BenjaminSchubert test work.
1 parent 0f9c070 commit e60ce24

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ publish: dist
3333
install:
3434
pip install
3535

36+
check_clang:
37+
cd test; python -m unittest -v test_base_driver test_clang_driver
38+
39+
3640
clean:
3741
rm -f wllvm/*.pyc wllvm/*~
3842

test/test_base_driver.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env python
2-
# -*- Coding: UTF-8 -*-
32

43
__author__ = 'Benjamin Schubert, ben.c.schubert@gmail.com'
54

test/test_clang_driver.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
# -*- Coding: UTF-8 -*-
2+
33
import os
44
from test_base_driver import root_directory, BaseDriverTest
55

@@ -22,4 +22,4 @@ def env(self):
2222
env["CXX"] = "wllvm++"
2323
env["LLVM_COMPILER"] = "clang"
2424
env["PATH"] = "{}:{}".format(root_directory, os.environ["PATH"])
25-
return env
25+
return env

test/test_dragonegg_driver.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
# -*- Coding: UTF-8 -*-
2+
33
import os
44
from test_base_driver import root_directory, BaseDriverTest
55

@@ -24,4 +24,4 @@ def env(self):
2424
# FIXME find dragonegg path generically
2525
env["LLVM_DRAGONEGG_PLUGIN"] = "/usr/lib/gcc/x86_64-linux-gnu/4.7/plugin/dragonegg.so"
2626
env["LLVM_GCC_PREFIX"] = "llvm-"
27-
return env
27+
return env

wllvm/as.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
"""This is the assembler phase.
2+
"""This is the (dragonegg) assembler phase.
33
44
This variant is only invoked during the second compilation where we
55
are building bitcode. The compiler has already been instructed to
@@ -15,11 +15,12 @@
1515
Since we cannot tell gcc what our assember is called, only which
1616
directory it should look for the assembler "as" in, we have to make a
1717
"hidden" directory that we can use to pass gcc. It needs to be hidden
18-
since we do not want our assembler to override the users assembler.
18+
since we have no control over the user's PATH and certainly do not
19+
want our assembler to accidently override the user's assembler.
1920
2021
This should explain:
2122
22-
../dragonegg_as/as
23+
./dragonegg_as/as
2324
2425
in the pip egg, and in the repository.
2526

0 commit comments

Comments
 (0)