From dd809792f82678cf6136fa5a2ad53d8e8c0adec3 Mon Sep 17 00:00:00 2001 From: Alexander-Makaryev Date: Fri, 19 Mar 2021 13:26:27 -0500 Subject: [PATCH 1/5] -exported_symbols_list --- mlir-compiler/mlir-compiler/CMakeLists.txt | 2 +- mlir-compiler/mlir-compiler/export_darwin.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 mlir-compiler/mlir-compiler/export_darwin.txt diff --git a/mlir-compiler/mlir-compiler/CMakeLists.txt b/mlir-compiler/mlir-compiler/CMakeLists.txt index b3b34ed07d4..b55a100925b 100644 --- a/mlir-compiler/mlir-compiler/CMakeLists.txt +++ b/mlir-compiler/mlir-compiler/CMakeLists.txt @@ -45,7 +45,7 @@ if (MSVC) endif () if(UNIX) - target_link_options(${PROJECT_NAME} PRIVATE "LINKER:--version-script=export.txt") + target_link_options(${PROJECT_NAME} PRIVATE "LINKER:-exported_symbols_list export_darwin.txt") endif() target_compile_definitions(${PROJECT_NAME} PRIVATE ${LLVM_DEFINITIONS}) diff --git a/mlir-compiler/mlir-compiler/export_darwin.txt b/mlir-compiler/mlir-compiler/export_darwin.txt new file mode 100644 index 00000000000..d481c6ad728 --- /dev/null +++ b/mlir-compiler/mlir-compiler/export_darwin.txt @@ -0,0 +1 @@ +PyInit_mlir_compiler From 0b67c4e3836d64d437ba8a73d141b9bf4ee2f8c3 Mon Sep 17 00:00:00 2001 From: Alexander-Makaryev Date: Fri, 19 Mar 2021 13:40:31 -0500 Subject: [PATCH 2/5] attempt 2 --- mlir-compiler/mlir-compiler/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mlir-compiler/mlir-compiler/CMakeLists.txt b/mlir-compiler/mlir-compiler/CMakeLists.txt index b55a100925b..79ffc60837a 100644 --- a/mlir-compiler/mlir-compiler/CMakeLists.txt +++ b/mlir-compiler/mlir-compiler/CMakeLists.txt @@ -45,7 +45,8 @@ if (MSVC) endif () if(UNIX) - target_link_options(${PROJECT_NAME} PRIVATE "LINKER:-exported_symbols_list export_darwin.txt") + # target_link_options(${PROJECT_NAME} PRIVATE "LINKER:-exported_symbols_list export_darwin.txt") + target_link_libraries(${PROJECT_NAME} PRIVATE "-Wl,-exported_symbols_list,export_darwin.txt") endif() target_compile_definitions(${PROJECT_NAME} PRIVATE ${LLVM_DEFINITIONS}) From c60fce48488d26a4afad58e19d34054783df2212 Mon Sep 17 00:00:00 2001 From: Alexander-Makaryev Date: Fri, 19 Mar 2021 14:01:21 -0500 Subject: [PATCH 3/5] debug --- mlir-compiler/mlir-compiler/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mlir-compiler/mlir-compiler/CMakeLists.txt b/mlir-compiler/mlir-compiler/CMakeLists.txt index 79ffc60837a..0f481f7dda1 100644 --- a/mlir-compiler/mlir-compiler/CMakeLists.txt +++ b/mlir-compiler/mlir-compiler/CMakeLists.txt @@ -46,7 +46,9 @@ endif () if(UNIX) # target_link_options(${PROJECT_NAME} PRIVATE "LINKER:-exported_symbols_list export_darwin.txt") - target_link_libraries(${PROJECT_NAME} PRIVATE "-Wl,-exported_symbols_list,export_darwin.txt") + message(STATUS "exported_symbols_list============================================") + message(STATUS ${CMAKE_CURRENT_SOURCE_DIR}) + target_link_libraries(${PROJECT_NAME} PRIVATE "-Wl,-exported_symbols_list,asdexport_darwin.txt") endif() target_compile_definitions(${PROJECT_NAME} PRIVATE ${LLVM_DEFINITIONS}) From 2b7fa49ffe2aea5494dddbdfd4e93a3cf5ed1484 Mon Sep 17 00:00:00 2001 From: Alexander-Makaryev Date: Fri, 19 Mar 2021 14:16:33 -0500 Subject: [PATCH 4/5] file can be found, underscore added --- mlir-compiler/mlir-compiler/CMakeLists.txt | 2 +- mlir-compiler/mlir-compiler/export_darwin.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mlir-compiler/mlir-compiler/CMakeLists.txt b/mlir-compiler/mlir-compiler/CMakeLists.txt index 0f481f7dda1..12e54cf46da 100644 --- a/mlir-compiler/mlir-compiler/CMakeLists.txt +++ b/mlir-compiler/mlir-compiler/CMakeLists.txt @@ -48,7 +48,7 @@ if(UNIX) # target_link_options(${PROJECT_NAME} PRIVATE "LINKER:-exported_symbols_list export_darwin.txt") message(STATUS "exported_symbols_list============================================") message(STATUS ${CMAKE_CURRENT_SOURCE_DIR}) - target_link_libraries(${PROJECT_NAME} PRIVATE "-Wl,-exported_symbols_list,asdexport_darwin.txt") + target_link_libraries(${PROJECT_NAME} PRIVATE "-Wl,-exported_symbols_list,export_darwin.txt") endif() target_compile_definitions(${PROJECT_NAME} PRIVATE ${LLVM_DEFINITIONS}) diff --git a/mlir-compiler/mlir-compiler/export_darwin.txt b/mlir-compiler/mlir-compiler/export_darwin.txt index d481c6ad728..a5d5900af2d 100644 --- a/mlir-compiler/mlir-compiler/export_darwin.txt +++ b/mlir-compiler/mlir-compiler/export_darwin.txt @@ -1 +1 @@ -PyInit_mlir_compiler +_PyInit_mlir_compiler From 5835cc47dfd6da1921336f3949ee73cbe7163e2d Mon Sep 17 00:00:00 2001 From: Alexander-Makaryev Date: Fri, 19 Mar 2021 14:28:22 -0500 Subject: [PATCH 5/5] both cases for Linux and Darwin --- mlir-compiler/mlir-compiler/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mlir-compiler/mlir-compiler/CMakeLists.txt b/mlir-compiler/mlir-compiler/CMakeLists.txt index 12e54cf46da..5458d260ab8 100644 --- a/mlir-compiler/mlir-compiler/CMakeLists.txt +++ b/mlir-compiler/mlir-compiler/CMakeLists.txt @@ -44,10 +44,11 @@ if (MSVC) target_compile_options(${PROJECT_NAME} PRIVATE /EHsc) endif () -if(UNIX) - # target_link_options(${PROJECT_NAME} PRIVATE "LINKER:-exported_symbols_list export_darwin.txt") - message(STATUS "exported_symbols_list============================================") - message(STATUS ${CMAKE_CURRENT_SOURCE_DIR}) +if (CMAKE_SYSTEM_NAME STREQUAL Linux) + target_link_options(${PROJECT_NAME} PRIVATE "LINKER:--version-script=export.txt") +endif() + +if (CMAKE_SYSTEM_NAME STREQUAL Darwin) target_link_libraries(${PROJECT_NAME} PRIVATE "-Wl,-exported_symbols_list,export_darwin.txt") endif()