From 851ee799c431eacf55508eee4ec274ae4166c88f Mon Sep 17 00:00:00 2001
From: Sean Keely <Sean.Keely@amd.com>
Date: Wed, 30 Oct 2019 01:24:43 -0500
Subject: [PATCH] Correct strip command.

Strip should only apply to the output target library.  Symlinks
with .so endings which will be relocated during install will cause
strip to fail, aborting the build.

Change-Id: Ieb598c2cec5277d9d14c8afa88b91ca2c7f4412d
---
 runtime/hsa-ext-image/CMakeLists.txt     | 2 +-
 runtime/hsa-runtime-tools/CMakeLists.txt | 2 +-
 runtime/hsa-runtime/CMakeLists.txt       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/hsa-ext-image/CMakeLists.txt b/runtime/hsa-ext-image/CMakeLists.txt
index 16b81e316c..3ccf608710 100755
--- a/runtime/hsa-ext-image/CMakeLists.txt
+++ b/runtime/hsa-ext-image/CMakeLists.txt
@@ -165,7 +165,7 @@ target_link_libraries (
 
 ## If the build is Release, strip the target library
 if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
-    add_custom_command ( TARGET ${IMAGE_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} *.so )
+    add_custom_command ( TARGET ${IMAGE_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} $<TARGET_FILE_NAME:${IMAGE_TARGET}> )
 endif ()
 
 ## Create symlinks for legacy packaging and install
diff --git a/runtime/hsa-runtime-tools/CMakeLists.txt b/runtime/hsa-runtime-tools/CMakeLists.txt
index 977ba117d8..e4830a744d 100755
--- a/runtime/hsa-runtime-tools/CMakeLists.txt
+++ b/runtime/hsa-runtime-tools/CMakeLists.txt
@@ -232,7 +232,7 @@ target_link_libraries (
 
 ## If the build is Release, strip the target library
 if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
-    add_custom_command ( TARGET ${TOOLS_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} *.so )
+    add_custom_command ( TARGET ${TOOLS_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} $<TARGET_FILE_NAME:${TOOLS_TARGET}> )
 endif ()
 
 ## Create symlinks for legacy packaging and install
diff --git a/runtime/hsa-runtime/CMakeLists.txt b/runtime/hsa-runtime/CMakeLists.txt
index 9eb7e32c5d..f292182295 100644
--- a/runtime/hsa-runtime/CMakeLists.txt
+++ b/runtime/hsa-runtime/CMakeLists.txt
@@ -169,7 +169,7 @@ target_link_libraries ( ${CORE_RUNTIME_TARGET}
 
 ## Strip should be optional or not at all
 if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
-#    add_custom_command ( TARGET ${CORE_RUNTIME_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} *.so )
+#    add_custom_command ( TARGET ${CORE_RUNTIME_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} $<TARGET_FILE_NAME:${CORE_RUNTIME_TARGET}> )
 endif ()
 
 ## Set the VERSION and SOVERSION values