Commit 80f294ea authored by Mateusz Belicki's avatar Mateusz Belicki

Fixed wrong output directory for ElfPackager when linking with LLVM7 provided by OS

Change-Id: Ic4b79d12ed347dee07b8af9e64cc22eb88871c57
parent 1f530e1f
......@@ -3261,7 +3261,7 @@ else()
find_package(LLVM ${IGC_PREFERRED_LLVM_VERSION})
if(LLVM_FOUND)
message(STATUS "[IGC] Using system LLVM ${LLVM_PACKAGE_VERSION}")
add_definitions(${LLVM_DEFINITIONS})
set(IGC_BUILD__USING_SYSTEM_LLVM TRUE)
# Check if found package has dynamic library and select them if possible.
llvm_map_components_to_libnames(llvm_libs all)
list(FIND llvm_libs "LLVM" DYN_LIB_INDEX)
......
......@@ -41,7 +41,7 @@ if (MSVC)
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE-INTERNAL "${CMAKE_SHARED_LINKER_FLAGS_RELEASE-INTERNAL} /OPT:REF /OPT:ICF")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi")
elseif(NOT IGC_LLVM_LINK_WITH_SYSTEM_LIBS)
elseif(NOT IGC_BUILD__USING_SYSTEM_LLVM)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR})
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LLVM_TOOLS_BINARY_DIR})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment