diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-02-06 12:02:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 12:02:47 +0100 |
| commit | 389c60da5e01761f4a11ef539ffa26e4c1b17875 (patch) | |
| tree | c6033924a0de9be1ab140596e305898c651bf57e /security/nss/coreconf/werror.py | |
| parent | 7c9b585349c985df0cf6ace83da5dadba8b5c677 (diff) | |
| parent | f017b749ea9f1586d2308504553d40bf4cc5439d (diff) | |
| download | UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.gz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.lz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.tar.xz UXP-389c60da5e01761f4a11ef539ffa26e4c1b17875.zip | |
Merge pull request #13 from MoonchildProductions/ported-upstream
Ported upstream
Diffstat (limited to 'security/nss/coreconf/werror.py')
| -rw-r--r-- | security/nss/coreconf/werror.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/nss/coreconf/werror.py b/security/nss/coreconf/werror.py index a37fad95f..0d3843f64 100644 --- a/security/nss/coreconf/werror.py +++ b/security/nss/coreconf/werror.py @@ -7,7 +7,8 @@ def main(): cc = os.environ.get('CC', 'cc') sink = open(os.devnull, 'wb') try: - cc_is_clang = 'clang' in subprocess.check_output([cc, '--version'], stderr=sink) + cc_is_clang = 'clang' in subprocess.check_output( + [cc, '--version'], universal_newlines=True, stderr=sink) except OSError: # We probably just don't have CC/cc. return @@ -25,6 +26,7 @@ def main(): try: v = subprocess.check_output([cc, '-dumpversion'], stderr=sink) v = v.strip(' \r\n').split('.') + v = list(map(int, v)) if v[0] < 4 or (v[0] == 4 and v[1] < 8): # gcc 4.8 minimum return False |