scons: fixup LIBDIR value settings - closes #1349
This commit is contained in:
parent
03422de504
commit
4340e9a605
1 changed files with 4 additions and 8 deletions
12
SConstruct
12
SConstruct
|
@ -32,6 +32,10 @@ try:
|
||||||
except:
|
except:
|
||||||
HAS_DISTUTILS = False
|
HAS_DISTUTILS = False
|
||||||
|
|
||||||
|
if platform.uname()[4] == 'ppc64':
|
||||||
|
LIBDIR_SCHEMA='lib64'
|
||||||
|
else:
|
||||||
|
LIBDIR_SCHEMA='lib'
|
||||||
|
|
||||||
py3 = None
|
py3 = None
|
||||||
|
|
||||||
|
@ -237,14 +241,6 @@ def sort_paths(items,priority):
|
||||||
new.extend(v)
|
new.extend(v)
|
||||||
return new
|
return new
|
||||||
|
|
||||||
if platform.dist()[0] in ('Ubuntu','debian'):
|
|
||||||
LIBDIR_SCHEMA='lib'
|
|
||||||
elif platform.uname()[4] == 'ppc64':
|
|
||||||
LIBDIR_SCHEMA='lib64'
|
|
||||||
else:
|
|
||||||
LIBDIR_SCHEMA='lib'
|
|
||||||
|
|
||||||
|
|
||||||
def pretty_dep(dep):
|
def pretty_dep(dep):
|
||||||
pretty = pretty_dep_names.get(dep)
|
pretty = pretty_dep_names.get(dep)
|
||||||
if pretty:
|
if pretty:
|
||||||
|
|
Loading…
Reference in a new issue