Changeset b2f1d2f in sasmodels


Ignore:
Timestamp:
Apr 7, 2017 10:17:35 AM (2 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:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/kerneldll.py

    r886fa25 rb2f1d2f  
    9797 
    9898if "SAS_COMPILER" in os.environ: 
    99     compiler = os.environ["SAS_COMPILER"] 
     99    COMPILER = os.environ["SAS_COMPILER"] 
    100100elif os.name == 'nt': 
    101     # If vcvarsall.bat has been called, then VCINSTALLDIR is in the environment 
    102     # and we can use the MSVC compiler.  Otherwise, if tinycc is available 
    103     # the use it.  Otherwise, hope that mingw is available. 
    104     if "VCINSTALLDIR" in os.environ: 
    105         compiler = "msvc" 
    106     elif tinycc: 
    107         compiler = "tinycc" 
     101    if tinycc is not None: 
     102        COMPILER = "tinycc" 
     103    elif "VCINSTALLDIR" in os.environ: 
     104        # If vcvarsall.bat has been called, then VCINSTALLDIR is in the environment 
     105        # and we can use the MSVC compiler.  Otherwise, if tinycc is available 
     106        # the use it.  Otherwise, hope that mingw is available. 
     107        COMPILER = "msvc" 
    108108    else: 
    109         compiler = "mingw" 
     109        COMPILER = "mingw" 
    110110else: 
    111     compiler = "unix" 
     111    COMPILER = "unix" 
    112112 
    113113ARCH = "" if ct.sizeof(ct.c_void_p) > 4 else "x86"  # 4 byte pointers on x86 
    114 if compiler == "unix": 
     114if COMPILER == "unix": 
    115115    # Generic unix compile 
    116116    # On mac users will need the X code command line tools installed 
     
    123123        """unix compiler command""" 
    124124        return CC + [source, "-o", output, "-lm"] 
    125 elif compiler == "msvc": 
     125elif COMPILER == "msvc": 
    126126    # Call vcvarsall.bat before compiling to set path, headers, libs, etc. 
    127127    # MSVC compiler is available, so use it.  OpenMP requires a copy of 
     
    139139        """MSVC compiler command""" 
    140140        return CC + ["/Tp%s"%source] + LN + ["/OUT:%s"%output] 
    141 elif compiler == "tinycc": 
     141elif COMPILER == "tinycc": 
    142142    # TinyCC compiler. 
    143143    CC = [tinycc.TCC] + "-shared -rdynamic -Wall".split() 
     
    145145        """tinycc compiler command""" 
    146146        return CC + [source, "-o", output] 
    147 elif compiler == "mingw": 
     147elif COMPILER == "mingw": 
    148148    # MinGW compiler. 
    149149    CC = "gcc -shared -std=c99 -O2 -Wall".split() 
Note: See TracChangeset for help on using the changeset viewer.