riscv
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Detection of the install path for 64 bits distros using /usr/lib

This commit is contained in:
Gabriel Gouvine 2015-05-03 21:10:42 +02:00
parent dc0485935d
commit 1cda835a48
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bootstrap/builder/Configuration.py
View File

@ -167,6 +167,7 @@ class Configuration ( object ):
elif self._osFedora .match(lines[0]): self._osType = "Linux.fc" elif self._osFedora .match(lines[0]): self._osType = "Linux.fc"
elif self._osLinux_64 .match(lines[0]): elif self._osLinux_64 .match(lines[0]):
self._osType = "Linux.x86_64" self._osType = "Linux.x86_64"
if os.path.exists("/usr/lib64/"):
self._libSuffix = "64" self._libSuffix = "64"
elif self._osLinux .match(lines[0]): self._osType = "Linux.i386" elif self._osLinux .match(lines[0]): self._osType = "Linux.i386"
elif self._osDarwin .match(lines[0]): self._osType = "Darwin" elif self._osDarwin .match(lines[0]): self._osType = "Darwin"

1
bootstrap/coriolisEnv.py
View File

@ -84,6 +84,7 @@ def guessOs ():
libDir = "lib64" libDir = "lib64"
elif osLinux_64.match(lines[0]): elif osLinux_64.match(lines[0]):
osType = "Linux.x86_64" osType = "Linux.x86_64"
if(os.path.exists("/usr/lib64/")):
libDir = "lib64" libDir = "lib64"
elif osLinux.match(lines[0]): elif osLinux.match(lines[0]):
osType = "Linux.i386" osType = "Linux.i386"