summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCallum Linden <113564339+callumlinden@users.noreply.github.com>2025-09-05 18:50:07 -0700
committerGitHub <noreply@github.com>2025-09-05 18:50:07 -0700
commit28b544251a05ace780d5902151f98d72f25c3905 (patch)
tree315cb6bd5d51d05ab6c74c24c98383d3e3be3328 /indra/newview
parent40e2b67db59603dd4e850011e556d56022016ad0 (diff)
parent8f43b5b77bf4b526af237217aa184215cb55731b (diff)
Merge pull request #4644 from RyeMutt/project/mac_universal
Fix macos build arch and deploy target due to cmake behavior changes
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 570c74f1cf..c727d5ae57 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1950,7 +1950,8 @@ elseif (DARWIN)
set_target_properties(${VIEWER_BINARY_NAME}
PROPERTIES
RESOURCE SecondLife.xib
- LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Xlinker -dead_strip -Xlinker -map -Xlinker ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}.MAP"
+ #LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Xlinker -dead_strip -Xlinker -map -Xlinker ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}.MAP"
+ LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Xlinker -dead_strip"
)
else (WINDOWS)
# Linux