From 0e6ce8031c6c8d1272abe627575b0ecc288587a0 Mon Sep 17 00:00:00 2001
From: Andrea Shepard <andrea@persephoneslair.org>
Date: Wed, 9 Oct 2019 08:06:29 +0000
Subject: [PATCH] Avoid 'components given, but unused' error from recent
llvm-config
---
SConstruct | 11 ++---------
src/SConscript | 8 ++++----
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/SConstruct b/SConstruct
index ad658220..43b9577b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -155,12 +155,6 @@ if GetOption('coverage'):
LDFLAGS=['--coverage'])
if env['CC'] == 'gcc':
env.Append(LIBS=['gcov'])
- else:
- # XXX Why do need this with --coverage when we're doing it anyway?
- if GetOption("use_llvm"):
- env.ParseConfig('%s --cflags --ldflags --libs core executionengine mcjit analysis x86codegen x86info' % \
- env["LLVM_CONFIG"])
-
dbg = env.Clone(VARIANT='debug')
if env['CC'] == 'cl':
@@ -276,9 +270,8 @@ if GetOption("use_llvm"):
# Make a fresh environment to parse the config into, to read out just LLVM stuff
llvm_dummy_env = Environment()
# Get LLVM stuff into LIBS/LDFLAGS
- llvm_dummy_env.ParseConfig('%s --ldflags %s %s %s' % \
- (env["LLVM_CONFIG"], llvm_system_libs_flag, llvm_linkage_type_flag, \
- llvm_required_components), \
+ llvm_dummy_env.ParseConfig('%s --ldflags %s %s' % \
+ (env["LLVM_CONFIG"], llvm_system_libs_flag, llvm_linkage_type_flag), \
function=llvm_config_sanitizer.sanitize)
# Get the right -l lines in
if llvm_use_shared:
diff --git a/src/SConscript b/src/SConscript
index fdd7eddf..17f24264 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -124,9 +124,9 @@ libhammer_static = env.StaticLibrary(static_library_name, parsers + backends + m
shared_env = env.Clone()
if GetOption("use_llvm"):
# Get LLVM stuff into LIBS/LDFLAGS
- shared_env.ParseConfig('%s --ldflags %s %s %s' % \
+ shared_env.ParseConfig('%s --ldflags %s %s' % \
(env["LLVM_CONFIG"], llvm_system_libs_flag, \
- llvm_linkage_type_flag, llvm_required_components), \
+ llvm_linkage_type_flag), \
function=llvm_config_sanitizer.sanitize)
# Get the right -l lines in
if llvm_use_shared:
@@ -163,9 +163,9 @@ if GetOption('with_tests'):
testenv.ParseConfig('pkg-config --cflags --libs glib-2.0')
if GetOption("use_llvm"):
# Get LLVM stuff into LIBS/LDFLAGS
- testenv.ParseConfig('%s --ldflags %s %s %s' % \
+ testenv.ParseConfig('%s --ldflags %s %s' % \
(env["LLVM_CONFIG"], llvm_system_libs_flag, \
- llvm_linkage_type_flag, llvm_required_components), \
+ llvm_linkage_type_flag), \
function=llvm_config_sanitizer.sanitize)
# Get the right -l lines in
if llvm_use_shared:
--
GitLab