Fixed import errors for "as" caused by trying to import

driver.popenwrapper

Author: Dan Liew

driver/utils.py

@@ -7,12 +7,27 @@
 import re
 import sys
 import tempfile
-from driver.popenwrapper import Popen
 
 fullSelfPath = os.path.realpath(__file__)
 prefix = os.path.dirname(fullSelfPath)
 driverDir = prefix
 
+# This is a bit hacky.
+# We cannot do
+# from .popenwrapper import Popen
+# OR
+# from driver.popenwrapper import Popen
+# because then 'as' will not succesfully import us (wllvm/wllvm++ can
+# successfully import however).
+#
+# Using
+# from popenwrapper import Popen
+# will allow 'as' to import us but then wllvm/wllvm++ will not be able to.
+#
+# The work around is to put this directory in the search path for modules.
+sys.path.insert(0,driverDir)
+from popenwrapper import Popen
+
 # Environmental variable for path to compiler tools (clang/llvm-link etc..)
 llvmCompilerPathEnv = 'LLVM_COMPILER_PATH'