[libcxx] r220534 - Change uses of `sys.platform == 'linux2' to `sys.platform.startswith('linux')

Eric Fiselier eric at efcs.ca
Thu Oct 23 15:57:56 PDT 2014


Author: ericwf
Date: Thu Oct 23 17:57:56 2014
New Revision: 220534

URL: http://llvm.org/viewvc/llvm-project?rev=220534&view=rev
Log:
Change uses of `sys.platform == 'linux2' to `sys.platform.startswith('linux')

Although the current method is valid up till python 3.3 (which is not supported)
this seems to be a clearer way of checking for linux and moves the tests towards
python 3 compatibility.

Modified:
    libcxx/trunk/test/lit.cfg

Modified: libcxx/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/lit.cfg?rev=220534&r1=220533&r2=220534&view=diff
==============================================================================
--- libcxx/trunk/test/lit.cfg (original)
+++ libcxx/trunk/test/lit.cfg Thu Oct 23 17:57:56 2014
@@ -367,7 +367,7 @@ class Configuration(object):
         # Configure extra compiler flags.
         self.compile_flags += ['-I' + self.src_root + '/include',
                                '-I' + self.src_root + '/test/support']
-        if sys.platform == 'linux2':
+        if sys.platform.startswith('linux'):
             self.compile_flags += ['-D__STDC_FORMAT_MACROS',
                                    '-D__STDC_LIMIT_MACROS',
                                    '-D__STDC_CONSTANT_MACROS']
@@ -402,7 +402,7 @@ class Configuration(object):
 
             if sys.platform == 'darwin':
                 self.link_flags += ['-lSystem']
-            elif sys.platform == 'linux2':
+            elif sys.platform.startswith('linux'):
                 self.link_flags += ['-lgcc_eh', '-lc', '-lm', '-lpthread',
                                     '-lrt', '-lgcc_s']
             elif sys.platform.startswith('freebsd'):
@@ -431,7 +431,7 @@ class Configuration(object):
         san = self.get_lit_conf('llvm_use_sanitizer', '').strip()
         if san:
             self.compile_flags += ['-fno-omit-frame-pointer']
-            if sys.platform == 'linux2':
+            if sys.platform.startswith('linux'):
                 self.link_flags += ['-ldl']
             if san == 'Address':
                 self.compile_flags += ['-fsanitize=address']





More information about the cfe-commits mailing list