From e0a8d953a7fb993863b50bb4d8de2568abcf9788 Mon Sep 17 00:00:00 2001 From: Anthony Shoumikhin Date: Fri, 13 Jun 2025 15:32:01 -0700 Subject: [PATCH 1/3] Update CMakeLists.txt for extension/apple to strip debug symbols path --- extension/apple/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/extension/apple/CMakeLists.txt b/extension/apple/CMakeLists.txt index d55fa381375..e26d0e4b47d 100644 --- a/extension/apple/CMakeLists.txt +++ b/extension/apple/CMakeLists.txt @@ -70,13 +70,17 @@ file(WRITE ${MODULE_MAP_FILE} ") set(SWIFT_CLANG_INTEROP_FLAGS "-Xcc -fmodule-map-file=${MODULE_MAP_FILE} -I ${MODULE_MAP_DIR}") +set(SWIFT_PATH_MAP_FLAGS + "-file-prefix-map=${PROJECT_SOURCE_DIR}=/executorch" + "-debug-prefix-map=${PROJECT_SOURCE_DIR}=/executorch" +) set_target_properties(extension_apple PROPERTIES Swift_MODULE_NAME "ExecuTorch" - Swift_FLAGS "${SWIFT_CLANG_INTEROP_FLAGS}" + Swift_FLAGS "${SWIFT_CLANG_INTEROP_FLAGS} ${SWIFT_PATH_MAP_FLAGS}" XCODE_ATTRIBUTE_SWIFT_MODULE_NAME "ExecuTorch" XCODE_ATTRIBUTE_BUILD_LIBRARY_FOR_DISTRIBUTION "YES" - XCODE_ATTRIBUTE_OTHER_SWIFT_FLAGS "${SWIFT_CLANG_INTEROP_FLAGS}" + XCODE_ATTRIBUTE_OTHER_SWIFT_FLAGS "${SWIFT_CLANG_INTEROP_FLAGS} ${SWIFT_PATH_MAP_FLAGS}" ) add_custom_command( From 2d09cbfb128c9a24634cb818d5fefea666b58d9a Mon Sep 17 00:00:00 2001 From: Anthony Shoumikhin Date: Fri, 13 Jun 2025 15:35:52 -0700 Subject: [PATCH 2/3] Update CMakeLists.txt --- extension/apple/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/extension/apple/CMakeLists.txt b/extension/apple/CMakeLists.txt index e26d0e4b47d..7688f12a2e9 100644 --- a/extension/apple/CMakeLists.txt +++ b/extension/apple/CMakeLists.txt @@ -70,6 +70,7 @@ file(WRITE ${MODULE_MAP_FILE} ") set(SWIFT_CLANG_INTEROP_FLAGS "-Xcc -fmodule-map-file=${MODULE_MAP_FILE} -I ${MODULE_MAP_DIR}") + set(SWIFT_PATH_MAP_FLAGS "-file-prefix-map=${PROJECT_SOURCE_DIR}=/executorch" "-debug-prefix-map=${PROJECT_SOURCE_DIR}=/executorch" @@ -77,10 +78,10 @@ set(SWIFT_PATH_MAP_FLAGS set_target_properties(extension_apple PROPERTIES Swift_MODULE_NAME "ExecuTorch" - Swift_FLAGS "${SWIFT_CLANG_INTEROP_FLAGS} ${SWIFT_PATH_MAP_FLAGS}" + Swift_FLAGS ${SWIFT_CLANG_INTEROP_FLAGS} ${SWIFT_PATH_MAP_FLAGS} XCODE_ATTRIBUTE_SWIFT_MODULE_NAME "ExecuTorch" XCODE_ATTRIBUTE_BUILD_LIBRARY_FOR_DISTRIBUTION "YES" - XCODE_ATTRIBUTE_OTHER_SWIFT_FLAGS "${SWIFT_CLANG_INTEROP_FLAGS} ${SWIFT_PATH_MAP_FLAGS}" + XCODE_ATTRIBUTE_OTHER_SWIFT_FLAGS ${SWIFT_CLANG_INTEROP_FLAGS} ${SWIFT_PATH_MAP_FLAGS} ) add_custom_command( From 0850353f3aeeb38ce969dfd80d714efd39fd104c Mon Sep 17 00:00:00 2001 From: Anthony Shoumikhin Date: Mon, 16 Jun 2025 11:07:10 -0700 Subject: [PATCH 3/3] Update CMakeLists.txt --- extension/apple/CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/extension/apple/CMakeLists.txt b/extension/apple/CMakeLists.txt index 7688f12a2e9..0e978073aa2 100644 --- a/extension/apple/CMakeLists.txt +++ b/extension/apple/CMakeLists.txt @@ -70,18 +70,14 @@ file(WRITE ${MODULE_MAP_FILE} ") set(SWIFT_CLANG_INTEROP_FLAGS "-Xcc -fmodule-map-file=${MODULE_MAP_FILE} -I ${MODULE_MAP_DIR}") - -set(SWIFT_PATH_MAP_FLAGS - "-file-prefix-map=${PROJECT_SOURCE_DIR}=/executorch" - "-debug-prefix-map=${PROJECT_SOURCE_DIR}=/executorch" -) +set(SWIFT_REMAP_FLAGS "-debug-prefix-map ${PROJECT_SOURCE_DIR}=/executorch") set_target_properties(extension_apple PROPERTIES Swift_MODULE_NAME "ExecuTorch" - Swift_FLAGS ${SWIFT_CLANG_INTEROP_FLAGS} ${SWIFT_PATH_MAP_FLAGS} + Swift_FLAGS "${SWIFT_CLANG_INTEROP_FLAGS} ${SWIFT_REMAP_FLAGS}" XCODE_ATTRIBUTE_SWIFT_MODULE_NAME "ExecuTorch" XCODE_ATTRIBUTE_BUILD_LIBRARY_FOR_DISTRIBUTION "YES" - XCODE_ATTRIBUTE_OTHER_SWIFT_FLAGS ${SWIFT_CLANG_INTEROP_FLAGS} ${SWIFT_PATH_MAP_FLAGS} + XCODE_ATTRIBUTE_OTHER_SWIFT_FLAGS "${SWIFT_CLANG_INTEROP_FLAGS} ${SWIFT_REMAP_FLAGS}" ) add_custom_command(