Changeset c101fe1 for waflib/Tools/c_config.py

Timestamp:

Nov 13, 2013, 1:00:56 PM (10 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

d3066e2

Parents:

54e74f0

Message:

waf, waflib: update to 1.7.13

File:

• waflib/Tools/c_config.py (modified) (3 diffs)

waflib/Tools/c_config.py

@@ -600 +600 @@
                 if out.find('__INTEL_COMPILER')>=0:
                         conf.fatal('The intel compiler pretends to be gcc')
-                if out.find('__GNUC__')<0:
+                if out.find('__GNUC__')<0 and out.find('__clang__')<0:
                         conf.fatal('Could not determine the compiler type')
         if icc and out.find('__INTEL_COMPILER')<0:
@@ -630 +630 @@
                 if isD('__ELF__'):
                         conf.env.DEST_BINFMT='elf'
-                elif isD('__WINNT__')or isD('__CYGWIN__'):
+                elif isD('__WINNT__')or isD('__CYGWIN__')or isD('_WIN32'):
                         conf.env.DEST_BINFMT='pe'
-                        conf.env.LIBDIR=conf.env['PREFIX']+'/bin'
+                        conf.env.LIBDIR=conf.env.BINDIR
                 elif isD('__APPLE__'):
                         conf.env.DEST_BINFMT='mac-o'
@@ -667 +667 @@
         else:
                 conf.fatal('Could not determine the XLC version.')
+@conf
+def get_suncc_version(conf,cc):
+        cmd=cc+['-V']
+        try:
+                out,err=conf.cmd_and_log(cmd,output=0)
+        except Errors.WafError:
+                conf.fatal('Could not find suncc %r'%cmd)
+        version=(out or err)
+        version=version.split('\n')[0]
+        version_re=re.compile(r'cc:\s+sun\s+(c\+\+|c)\s+(?P<major>\d*)\.(?P<minor>\d*)',re.I).search
+        match=version_re(version)
+        if match:
+                k=match.groupdict()
+                conf.env['CC_VERSION']=(k['major'],k['minor'])
+        else:
+                conf.fatal('Could not determine the suncc version.')
 @conf
 def add_as_needed(self):