diff options
| author | Francis Ricci <francisjricci@gmail.com> | 2017-01-10 04:33:04 +0000 |
|---|---|---|
| committer | Francis Ricci <francisjricci@gmail.com> | 2017-01-10 04:33:04 +0000 |
| commit | 9f93113ee5c1cc0fbbb8a5386e30df333924de83 (patch) | |
| tree | 7679c109c93068320b5f37f92248d2754de04eac /test | |
| parent | 8f1700544049edd19dc47d0597d8230c619d84d0 (diff) | |
Make cmake link flag naming consistent
Summary:
The build system was inconsistent in its naming conventions for
link flags. This patch changes all uses of LINKFLAGS to LINK_FLAGS,
for consistency with cmake's LINK_FLAGS property.
This patch should make it easier to search the source code for
uses of link flags, as well as providing the benefit of improved
style and consistency.
Reviewers: compnerd, beanz
Subscribers: kubabrecka, llvm-commits, mgorny
Differential Revision: https://reviews.llvm.org/D28506
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@291539 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
| -rw-r--r-- | test/asan/lit.cfg | 8 | ||||
| -rw-r--r-- | test/profile/lit.cfg | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/asan/lit.cfg b/test/asan/lit.cfg index 1059f393a..7703f5a31 100644 --- a/test/asan/lit.cfg +++ b/test/asan/lit.cfg @@ -61,18 +61,18 @@ else: # GCC-ASan doesn't link in all the necessary libraries automatically, so # we have to do it ourselves. if config.compiler_id == 'GNU': - extra_linkflags = ["-pthread", "-lstdc++", libdl_flag] + extra_link_flags = ["-pthread", "-lstdc++", libdl_flag] else: - extra_linkflags = [] + extra_link_flags = [] # BFD linker in 64-bit android toolchains fails to find libm.so, which is a # transitive shared library dependency (via asan runtime). if config.android: - extra_linkflags += ["-lm"] + extra_link_flags += ["-lm"] # Setup default compiler flags used with -fsanitize=address option. # FIXME: Review the set of required flags and check if it can be reduced. -target_cflags = [get_required_attr(config, "target_cflags")] + extra_linkflags +target_cflags = [get_required_attr(config, "target_cflags")] + extra_link_flags target_cxxflags = config.cxx_mode_flags + target_cflags clang_asan_static_cflags = (["-fsanitize=address", "-mno-omit-leaf-frame-pointer", diff --git a/test/profile/lit.cfg b/test/profile/lit.cfg index a6e6ef81c..9ca394212 100644 --- a/test/profile/lit.cfg +++ b/test/profile/lit.cfg @@ -34,9 +34,9 @@ if config.test_exec_root is None: raise SystemExit if config.host_os in ['Linux']: - extra_linkflags = ["-ldl"] + extra_link_flags = ["-ldl"] else: - extra_linkflags = [] + extra_link_flags = [] # Test suffixes. config.suffixes = ['.c', '.cc', '.cpp', '.m', '.mm', '.ll', '.test'] @@ -46,7 +46,7 @@ config.excludes = ['Inputs'] # Clang flags. target_cflags=[get_required_attr(config, "target_cflags")] -clang_cflags = target_cflags + extra_linkflags +clang_cflags = target_cflags + extra_link_flags clang_cxxflags = config.cxx_mode_flags + clang_cflags def build_invocation(compile_flags, with_lto = False): |