Changeset 1a3602d in sasview

Timestamp:

Nov 22, 2017 12:21:13 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

237f35e

Parents:

f0ce6e2

Message:

tinycc support in setup (sldi branch)

File:

• setup.py (modified) (2 diffs)

setup.py

@@ -18 +18 @@
 from setuptools import Extension, setup
 
-if os.name == 'nt':
-    try:
-        import tinycc
-    except ImportError:
-        os.path.insert(os.path.insert(0, '..', 'tinycc'))
-        import tinycc
-    use_tinycc = True
-    sys.argv.append('--compiler=mingw32')
-    print(tinycc.TCC)
-else:
-    use_tinycc = False
+try:
+    import tinycc.distutils
+except ImportError:
+    pass
 
 # Manage version number ######################################
@@ -147 +140 @@
 class build_ext_subclass(build_ext):
     def build_extensions(self):
-        if use_tinycc:
-            # Note: no -O option because not an optimizer
-            self.compiler.set_executables(
-                #archiver = ['ar', '-cr'],
-                compiler=[tinycc.TCC, '-DMS_WIN64', '-D__TINYCC__', '-Wall'],
-                #compiler_cxx=['g__', '-DMS_WIN64', '-Wall'],  # tinycc is not a C++ compiler
-                compiler_so=[tinycc.TCC, '-DMS_WIN64', '-D__TINYCC__', '-Wall'],  # and '-c'??
-                #dll_libraries=['msvcr90'],
-                linker_exe=[tinycc.TCC, '-DMS_WIN64'],
-                linker_so=[tinycc.TCC, '-DMS_WIN64', '-shared'],
-                #linker_dll=tinycc.TCC,
-            )
-            sysroot = os.path.dirname(os.path.realpath(sys.executable))
-            self.compiler.include_dirs = [os.path.join(sysroot, 'include')]
-            self.compiler.library_dirs = [sysroot]
         # Get 64-bitness
         c = self.compiler.compiler_type