mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-09-29 13:54:57 +00:00
[CMake] Add missing set_output_directory after Takumi's change in r198205.
Plugins need to go in build/Debug/lib as well (rather than build/lib/Debug). Also, fix the SHLIBDIR path for Xcode, which by default includes Xcode build settings rather than a simple %(build_mode)s parameter. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@198344 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
f79b35a038
commit
ecc59f2299
@ -177,6 +177,7 @@ ${name} ignored.")
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library( ${name} ${libkind} ${ALL_FILES} )
|
add_library( ${name} ${libkind} ${ALL_FILES} )
|
||||||
|
set_output_directory(${name} ${LLVM_RUNTIME_OUTPUT_INTDIR} ${LLVM_LIBRARY_OUTPUT_INTDIR})
|
||||||
set_target_properties( ${name} PROPERTIES PREFIX "" )
|
set_target_properties( ${name} PROPERTIES PREFIX "" )
|
||||||
add_dead_strip( ${name} )
|
add_dead_strip( ${name} )
|
||||||
|
|
||||||
@ -391,7 +392,6 @@ function(configure_lit_site_cfg input output)
|
|||||||
set(TARGETS_TO_BUILD ${TARGETS_BUILT})
|
set(TARGETS_TO_BUILD ${TARGETS_BUILT})
|
||||||
|
|
||||||
set(SHLIBEXT "${LTDL_SHLIB_EXT}")
|
set(SHLIBEXT "${LTDL_SHLIB_EXT}")
|
||||||
set(SHLIBDIR "${LLVM_LIBRARY_OUTPUT_INTDIR}")
|
|
||||||
|
|
||||||
if(BUILD_SHARED_LIBS)
|
if(BUILD_SHARED_LIBS)
|
||||||
set(LLVM_SHARED_LIBS_ENABLED "1")
|
set(LLVM_SHARED_LIBS_ENABLED "1")
|
||||||
@ -419,6 +419,7 @@ function(configure_lit_site_cfg input output)
|
|||||||
set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR})
|
set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR})
|
||||||
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
|
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_TOOLS_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
|
||||||
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_LIBS_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
|
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_LIBS_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
|
||||||
|
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} SHLIBDIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
|
||||||
set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
|
set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
|
||||||
set(ENABLE_SHARED ${LLVM_SHARED_LIBS_ENABLED})
|
set(ENABLE_SHARED ${LLVM_SHARED_LIBS_ENABLED})
|
||||||
set(SHLIBPATH_VAR ${SHLIBPATH_VAR})
|
set(SHLIBPATH_VAR ${SHLIBPATH_VAR})
|
||||||
|
@ -26,6 +26,7 @@ config.have_zlib = "@HAVE_LIBZ@"
|
|||||||
# used when we can't determine the tool dir at configuration time.
|
# used when we can't determine the tool dir at configuration time.
|
||||||
try:
|
try:
|
||||||
config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
|
config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
|
||||||
|
config.llvm_shlib_dir = config.llvm_shlib_dir % lit_config.params
|
||||||
except KeyError:
|
except KeyError:
|
||||||
e = sys.exc_info()[1]
|
e = sys.exc_info()[1]
|
||||||
key, = e.args
|
key, = e.args
|
||||||
|
Loading…
Reference in New Issue
Block a user