Changeset b2f1d2f in sasmodels for sasmodels/kerneldll.py

Timestamp:

Apr 7, 2017 10:17:35 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, 41709dc

Parents:

dbfd471

Message:

default to tinycc compiler on windows; override with SAS_COMPILER in the environment

File:

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

sasmodels/kerneldll.py

@@ -97 +97 @@
 
 if "SAS_COMPILER" in os.environ:
-    compiler = os.environ["SAS_COMPILER"]
+    COMPILER = os.environ["SAS_COMPILER"]
 elif os.name == 'nt':
-    # If vcvarsall.bat has been called, then VCINSTALLDIR is in the environment
-    # and we can use the MSVC compiler.  Otherwise, if tinycc is available
-    # the use it.  Otherwise, hope that mingw is available.
-    if "VCINSTALLDIR" in os.environ:
-        compiler = "msvc"
-    elif tinycc:
-        compiler = "tinycc"
+    if tinycc is not None:
+        COMPILER = "tinycc"
+    elif "VCINSTALLDIR" in os.environ:
+        # If vcvarsall.bat has been called, then VCINSTALLDIR is in the environment
+        # and we can use the MSVC compiler.  Otherwise, if tinycc is available
+        # the use it.  Otherwise, hope that mingw is available.
+        COMPILER = "msvc"
     else:
-        compiler = "mingw"
+        COMPILER = "mingw"
 else:
-    compiler = "unix"
+    COMPILER = "unix"
 
 ARCH = "" if ct.sizeof(ct.c_void_p) > 4 else "x86"  # 4 byte pointers on x86
-if compiler == "unix":
+if COMPILER == "unix":
     # Generic unix compile
     # On mac users will need the X code command line tools installed
@@ -123 +123 @@
         """unix compiler command"""
         return CC + [source, "-o", output, "-lm"]
-elif compiler == "msvc":
+elif COMPILER == "msvc":
     # Call vcvarsall.bat before compiling to set path, headers, libs, etc.
     # MSVC compiler is available, so use it.  OpenMP requires a copy of
@@ -139 +139 @@
         """MSVC compiler command"""
         return CC + ["/Tp%s"%source] + LN + ["/OUT:%s"%output]
-elif compiler == "tinycc":
+elif COMPILER == "tinycc":
     # TinyCC compiler.
     CC = [tinycc.TCC] + "-shared -rdynamic -Wall".split()
@@ -145 +145 @@
         """tinycc compiler command"""
         return CC + [source, "-o", output]
-elif compiler == "mingw":
+elif COMPILER == "mingw":
     # MinGW compiler.
     CC = "gcc -shared -std=c99 -O2 -Wall".split()