[BOLT] avoid setting ARCHIVE_OUTPUT_DIRECTORY as LLVM_LIBRARY_DIR

RossComputerGuy · RossComputerGuy · commit 099550879dc2 · 2024-07-22T17:39:37.000-07:00
diff --git a/bolt/runtime/CMakeLists.txt b/bolt/runtime/CMakeLists.txt
@@ -16,12 +16,12 @@ add_library(bolt_rt_instr STATIC
   instr.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/config.h
   )
-set_target_properties(bolt_rt_instr PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${LLVM_LIBRARY_DIR}")
+set_target_properties(bolt_rt_instr PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")
 add_library(bolt_rt_hugify STATIC
   hugify.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/config.h
   )
-set_target_properties(bolt_rt_hugify PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${LLVM_LIBRARY_DIR}")
+set_target_properties(bolt_rt_hugify PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")
 
 set(BOLT_RT_FLAGS
   -ffreestanding

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ add_library(bolt_rt_instr STATIC`
`16`	`16`	`instr.cpp`
`17`	`17`	`${CMAKE_CURRENT_BINARY_DIR}/config.h`
`18`	`18`	`)`
`19`		`-set_target_properties(bolt_rt_instr PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${LLVM_LIBRARY_DIR}")`
	`19`	`+set_target_properties(bolt_rt_instr PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")`
`20`	`20`	`add_library(bolt_rt_hugify STATIC`
`21`	`21`	`hugify.cpp`
`22`	`22`	`${CMAKE_CURRENT_BINARY_DIR}/config.h`
`23`	`23`	`)`
`24`		`-set_target_properties(bolt_rt_hugify PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${LLVM_LIBRARY_DIR}")`
	`24`	`+set_target_properties(bolt_rt_hugify PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}")`
`25`	`25`
`26`	`26`	`set(BOLT_RT_FLAGS`
`27`	`27`	`-ffreestanding`