From e07adc287f5a90a67e65efefacd697c6e1f6a899 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 24 Jan 2019 20:51:42 -0500 Subject: [PATCH] P4 to Git Change 1735485 by marsenau@marsenau-fiji on 2019/01/24 20:39:56 SWDEV-127767 - Don't guess at the suffix for the device libraries Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#18 edit --- rocclr/runtime/device/rocm/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rocclr/runtime/device/rocm/CMakeLists.txt b/rocclr/runtime/device/rocm/CMakeLists.txt index 4c224f84be..cea1429dbd 100644 --- a/rocclr/runtime/device/rocm/CMakeLists.txt +++ b/rocclr/runtime/device/rocm/CMakeLists.txt @@ -1,5 +1,5 @@ include(bc2h) - +1;95;0c set(INC_SUFFIX "amdgcn.inc") include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/loaders/elf/utils/common) @@ -27,9 +27,10 @@ set_target_properties(oclrocm PROPERTIES POSITION_INDEPENDENT_CODE ON) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libraries.amdgcn.inc "// Automatically generated file; DO NOT EDIT.\n") foreach(AMDGCN_LIB_TARGET ${AMDGCN_LIB_TARGETS}) + get_target_property(lib_file ${AMDGCN_LIB_TARGET} OUTPUT_NAME) get_target_property(lib_file_name ${AMDGCN_LIB_TARGET} ARCHIVE_OUTPUT_NAME) get_target_property(lib_file_path ${AMDGCN_LIB_TARGET} ARCHIVE_OUTPUT_DIRECTORY) - set(bclib "${lib_file_path}/${lib_file_name}.amdgcn.bc") + set(bclib "${lib_file}") set(header "${lib_file_name}.${INC_SUFFIX}") set(symbol "${lib_file_name}_lib") add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${header}