mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-25 12:12:47 +01:00
51ae9734a2
Multi-configuration generators (such as Visual Studio and Xcode) allow the specification of a build flavor at build time instead of config time, so the lit configuration files need to support that - and they do for the most part. There are several places that had one of two issues (or both!): 1) Paths had %(build_mode)s set up, but then not configured, resulting in values that would not work correctly e.g. D:/llvm-build/%(build_mode)s/bin/dsymutil.exe 2) Paths did not have %(build_mode)s set up, but instead contained $(Configuration) (which is the value for Visual Studio at configuration time, for Xcode they would have had the equivalent) e.g. "D:/llvm-build/$(Configuration)/lib". This seems to indicate that we still have a lot of fragility in the configurations, but also that a number of these paths are never used (at least on Windows) since the errors appear to have been there a while. This patch fixes the configurations and it has been tested with Ninja and Visual Studio to generate the correct paths. We should consider removing some of these settings altogether. Reviewed By: JDevlieghere, mehdi_amini Differential Revision: https://reviews.llvm.org/D96427
26 lines
954 B
Python
26 lines
954 B
Python
@LIT_SITE_CFG_IN_HEADER@
|
|
|
|
import sys
|
|
|
|
config.llvm_src_root = path(r"@LLVM_SOURCE_DIR@")
|
|
config.llvm_obj_root = path(r"@LLVM_BINARY_DIR@")
|
|
config.llvm_tools_dir = path(r"@LLVM_TOOLS_DIR@")
|
|
config.llvm_build_mode = "@LLVM_BUILD_MODE@"
|
|
config.enable_shared = @ENABLE_SHARED@
|
|
config.shlibdir = path(r"@SHLIBDIR@")
|
|
|
|
# Support substitution of the tools_dir and build_mode with user parameters.
|
|
# This is used when we can't determine the tool dir at configuration time.
|
|
try:
|
|
config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
|
|
config.llvm_build_mode = config.llvm_build_mode % lit_config.params
|
|
config.shlibdir = config.shlibdir % lit_config.params
|
|
except KeyError:
|
|
e = sys.exc_info()[1]
|
|
key, = e.args
|
|
lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
|
|
|
|
# Let the main config do the real work.
|
|
lit_config.load_config(
|
|
config, os.path.join(config.llvm_src_root, "test/Unit/lit.cfg.py"))
|