Changeset 15e74ad in sasmodels

Timestamp:

May 31, 2016 8:43:34 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

7f3a89c

Parents:

6708a6a

Message:

code cleanup

File:

• sasmodels/kerneldll.py (modified) (4 diffs)

sasmodels/kerneldll.py

@@ -85 +85 @@
     elif tinycc:
         # TinyCC compiler.
-        CC = [tinycc.find_tcc_path()] + "-shared -rdynamic -Wall".split()
+        CC = [tinycc.TCC] + "-shared -rdynamic -Wall".split()
         def compile_command(source, output):
-            return CC + ["%s"%source, "-o", "%s"%output]
+            return CC + [source, "-o", output]
     else:
         # MinGW compiler.
@@ -94 +94 @@
             CC.append("-fopenmp")
         def compile_command(source, output):
-            return CC + ["%s"%source, "-o", "%s"%output, "-lm"]
+            return CC + [source, "-o", output, "-lm"]
 else:
     ARCH = ""
@@ -105 +105 @@
         CC.append("-fopenmp")
     def compile_command(source, output):
-        return CC + ["%s"%source, "-o", "%s"%output, "-lm"]
+        return CC + [source, "-o", output, "-lm"]
 
 # Windows-specific solution
@@ -123 +123 @@
     command_str = " ".join('"%s"'%p if ' ' in p else p for p in command)
     logging.info(command_str)
-    shell = (os.name == 'nt')
     try:
+        # need shell=True on windows to keep console box from popping up
+        shell = (os.name == 'nt')
         subprocess.check_output(command, shell=shell, stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as exc: