remove unnecessary and *nix-centric LANG= from start of command used to get gcc version; use python's platform.uname() rather than os.uname() to get platform information
This commit is contained in:
parent
75212b28b2
commit
60134ddcba
5
wscript
5
wscript
@ -6,6 +6,7 @@ import re
|
|||||||
import string
|
import string
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import platform as PLATFORM
|
||||||
|
|
||||||
def fetch_git_revision ():
|
def fetch_git_revision ():
|
||||||
cmd = "git describe HEAD"
|
cmd = "git describe HEAD"
|
||||||
@ -85,7 +86,7 @@ i18n_children = [
|
|||||||
# Version stuff
|
# Version stuff
|
||||||
|
|
||||||
def fetch_gcc_version (CC):
|
def fetch_gcc_version (CC):
|
||||||
cmd = "LANG= %s --version" % CC
|
cmd = "%s --version" % CC
|
||||||
output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
|
output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
|
||||||
o = output[0].decode('utf-8')
|
o = output[0].decode('utf-8')
|
||||||
version = o.split(' ')[2].split('.')
|
version = o.split(' ')[2].split('.')
|
||||||
@ -127,7 +128,7 @@ def set_compiler_flags (conf,opt):
|
|||||||
optimization_flags = []
|
optimization_flags = []
|
||||||
debug_flags = []
|
debug_flags = []
|
||||||
|
|
||||||
u = os.uname ()
|
u = PLATFORM.uname ()
|
||||||
cpu = u[4]
|
cpu = u[4]
|
||||||
platform = u[0].lower()
|
platform = u[0].lower()
|
||||||
version = u[2]
|
version = u[2]
|
||||||
|
Loading…
Reference in New Issue
Block a user