From ceab9a3eb00e0c67c0fdff78e40884ecfd5ca099 Mon Sep 17 00:00:00 2001
From: James Edwards <JamesAdrian.Edwards@amd.com>
Date: Thu, 19 May 2016 15:48:42 -0500
Subject: [PATCH] Update hsa-ext-image CMakeList.txt file to include static lib
 compiler options

Change-Id: I06cff984d3dc169cdb30832bf0115bc7d821eadf
---
 runtime/hsa-ext-image/CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/runtime/hsa-ext-image/CMakeLists.txt b/runtime/hsa-ext-image/CMakeLists.txt
index c7f75d5f72..05102d9cbd 100755
--- a/runtime/hsa-ext-image/CMakeLists.txt
+++ b/runtime/hsa-ext-image/CMakeLists.txt
@@ -151,11 +151,16 @@ endif ()
 
 set_property ( TARGET ${IMAGE_TARGET} PROPERTY SOVERSION "${VERSION_MAJOR}" )
 
+## Add the core runtime in the link
+set ( LIBHSAIL -Wl,--no-whole-archive PRIVATE ${HSA_BUILD_LIB_PATH}/libhsail.a )
+set ( LIBHSAILAMD -Wl,--no-whole-archive PRIVATE ${HSA_BUILD_LIB_PATH}/libhsail-amd.a )
+
 ## Add the core runtime in the link
 link_directories(${HSA_BUILD_LIB_PATH})
 target_link_libraries (
     ${IMAGE_TARGET}
-    PRIVATE ${HSA_BUILD_LIB_PATH}/libhsail-amd.a
+    PRIVATE ${LIBHSAIL}
+    PRIVATE ${LIBHSAILAMD}
     PRIVATE ${HSA_BUILD_LIB_PATH}/libhsail.a
     PRIVATE ${HSA_BUILD_LIB_PATH}/${CORE_RUNTIME_LIB}
     c dl pthread rt