build/llvmPackages: don't need to patch omp
After wuxi's merge request, this won't be necessary anymore.
This commit is contained in:
@@ -1,13 +0,0 @@
|
|||||||
diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
|
|
||||||
index bdb867e352f7..a0b6e50e0ce8 100644
|
|
||||||
--- a/openmp/runtime/src/CMakeLists.txt
|
|
||||||
+++ b/openmp/runtime/src/CMakeLists.txt
|
|
||||||
@@ -148,7 +148,7 @@ libomp_get_libflags(LIBOMP_CONFIGURED_LIBFLAGS)
|
|
||||||
if(OPENMP_STANDALONE_BUILD OR (NOT OPENMP_ENABLE_LIBOMP_PROFILING))
|
|
||||||
add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES})
|
|
||||||
# Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS
|
|
||||||
- target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${CMAKE_DL_LIBS})
|
|
||||||
+ target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${CMAKE_DL_LIBS} "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports_so.txt")
|
|
||||||
else()
|
|
||||||
add_llvm_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES} PARTIAL_SOURCES_INTENDED
|
|
||||||
LINK_LIBS ${LIBOMP_CONFIGURED_LIBFLAGS} ${CMAKE_DL_LIBS}
|
|
||||||
@@ -110,17 +110,6 @@ export function llvmPackages({
|
|||||||
return {
|
return {
|
||||||
name: "llvm",
|
name: "llvm",
|
||||||
platform,
|
platform,
|
||||||
patchPhase: async () => {
|
|
||||||
if (platform.buildPlatform.arch !== 'x86_64'
|
|
||||||
&& platform.buildPlatform.arch !== 'aarch64') {
|
|
||||||
// Apply llvm omp patch
|
|
||||||
await promisifySpawn(spawn("git",
|
|
||||||
[
|
|
||||||
"apply",
|
|
||||||
path.resolve(projectRoot, "assets", "omp.diff"),
|
|
||||||
], spawnOptions));
|
|
||||||
}
|
|
||||||
},
|
|
||||||
configurePhase: async () => {
|
configurePhase: async () => {
|
||||||
// Configure
|
// Configure
|
||||||
await promisifySpawn(spawn(cmake, command({
|
await promisifySpawn(spawn(cmake, command({
|
||||||
|
|||||||
Reference in New Issue
Block a user