riscv
/
coriolis
mirror of https://gitlab.lip6.fr/vlsi-eda/coriolis.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adds LIB_SUFFIX to all CMakeLists install "lib" targets, so that 64 bits 

libraries gets installed in "lib64" instead of "lib".

buildCoriolis.py sets automatically LIB_SUFFIX for cmake.
coriolis2.spec modificated to uses lib64 on 64 bits.
This commit is contained in:
Jean-Paul Chaput 2010-05-17 21:19:02 +00:00
parent d2206fd246
commit 029c5e8989
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bootstrap/buildCoriolis.py
View File

@ -121,6 +121,7 @@ class ProjectBuilder:
def _guessOs ( self ):
self._libSuffix = None
self._osSLSoC5x_64 = re.compile (".*Linux.*el5.*x86_64.*")
self._osSLSoC5x = re.compile (".*Linux.*(el5|2.6.23.13.*SoC).*")
self._osLinux_64 = re.compile (".*Linux.*x86_64.*")
@ -130,9 +131,13 @@ class ProjectBuilder:
uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE )
lines = uname.stdout.readlines()
if self._osSLSoC5x_64.match(lines[0]): self._osType = "Linux.SLSoC5x_64"
if self._osSLSoC5x_64.match(lines[0]):
self._osType = "Linux.SLSoC5x_64"
self._libSuffix = "64"
elif self._osSLSoC5x .match(lines[0]): self._osType = "Linux.SLSoC5x"
elif self._osLinux_64 .match(lines[0]): self._osType = "Linux.x86_64"
elif self._osLinux_64 .match(lines[0]):
self._osType = "Linux.x86_64"
self._libSuffix = "64"
elif self._osLinux .match(lines[0]): self._osType = "Linux.i386"
elif self._osDarwin .match(lines[0]): self._osType = "Darwin"
else:
@ -236,7 +241,10 @@ class ProjectBuilder:
, "-D", "CHECK_DETERMINISM:STRING=%s" % self._checkDeterminism
, "-D", "CMAKE_VERBOSE_MAKEFILE:STRING=%s" % self._verboseMakefile
, "-D", "CMAKE_INSTALL_PREFIX:STRING=%s" % self._installDir
, toolSourceDir ]
]
if self._libSuffix:
command += [ "-D", "LIB_SUFFIX:STRING=%s" % self._libSuffix ]
command += [ toolSourceDir ]
self._execute ( command, "Second CMake failed" )
if self._doBuild: