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

fix rpaths - really didn't need quoting

This commit is contained in:
Robert Taylor 2022-12-10 17:10:14 +00:00
parent 6ed871be55
commit 474fe928ec
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bootstrap/cmake_modules/FindBootstrap.cmake
View File

@ -10,6 +10,7 @@
cmake_policy(SET CMP0079 NEW) cmake_policy(SET CMP0079 NEW)
cmake_policy(SET CMP0022 NEW) cmake_policy(SET CMP0022 NEW)
cmake_policy(SET CMP0060 NEW) cmake_policy(SET CMP0060 NEW)
cmake_policy(SET CMP0095 NEW)
#if(NOT (CMAKE_VERSION VERSION_LESS 2.8.0)) #if(NOT (CMAKE_VERSION VERSION_LESS 2.8.0))
# cmake_policy(SET CMP0014 OLD) # cmake_policy(SET CMP0014 OLD)
#endif() #endif()

4
build.py
View File

@ -91,7 +91,7 @@ class ExtensionBuilder(build_ext):
cmake_args += ["-DCMAKE_BUILD_RPATH_USE_ORIGIN=1"] cmake_args += ["-DCMAKE_BUILD_RPATH_USE_ORIGIN=1"]
cmake_args += ["-DCMAKE_SKIP_BUILD_RPATH=FALSE"] cmake_args += ["-DCMAKE_SKIP_BUILD_RPATH=FALSE"]
cmake_args += ["-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"] cmake_args += ["-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"]
cmake_args += ["-DCMAKE_INSTALL_RPATH=\${ORIGIN}/lib:\${ORIGIN}"] cmake_args += ["-DCMAKE_INSTALL_RPATH='$ORIGIN/lib:$ORIGIN'"]
cmake_args += ["-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE"] cmake_args += ["-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE"]
subprocess.check_call(["cmake", "--debug-find", "--trace-redirect=build.cmake.trace", "--trace-expand", ext.sourcedir] + cmake_args, cwd=build_dir, env=env) subprocess.check_call(["cmake", "--debug-find", "--trace-redirect=build.cmake.trace", "--trace-expand", ext.sourcedir] + cmake_args, cwd=build_dir, env=env)
@ -105,7 +105,7 @@ class ExtensionBuilder(build_ext):
if 'ELF' in line: #TODO support other OSs if 'ELF' in line: #TODO support other OSs
f = line.split(':')[0] f = line.split(':')[0]
print(f"fixing up {f}") print(f"fixing up {f}")
subprocess.check_call(["patchelf", "--set-rpath", '${ORIGIN}/../../lib', f]) subprocess.check_call(["patchelf", "--set-rpath", '$ORIGIN/../../lib', f])
def build(setup_kwargs: Dict[str, Any]) -> None: def build(setup_kwargs: Dict[str, Any]) -> None:
cmake_modules = [ cmake_modules = [