summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolai Hähnle <nicolai.haehnle@amd.com>2017-07-31 17:17:44 +0200
committerNicolai Hähnle <nicolai.haehnle@amd.com>2017-07-31 17:19:13 +0200
commit90c8f17cf8fbe696dede841b0f3faca2556854fe (patch)
tree4150d04cbc4e5f6b3ba24ba5d6f71276e480e098
parentd85802e501a67e193a4a363cfe3b4c17c3d9e2e9 (diff)
Attempt to fix AppVeyor build, round 2
-rw-r--r--src/util/SConscript12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/util/SConscript b/src/util/SConscript
index 00bd89c013..0c3c98a5f4 100644
--- a/src/util/SConscript
+++ b/src/util/SConscript
@@ -31,15 +31,17 @@ source_lists = env.ParseSourceList('Makefile.sources')
mesautil_sources = (
source_lists['MESA_UTIL_FILES'] +
- source_lists['MESA_UTIL_GENERATED_FILES'] +
- source_lists['XMLCONFIG_FILES']
+ source_lists['MESA_UTIL_GENERATED_FILES']
)
mesautilenv = env.Clone()
-mesautilenv.AppendUnique(LIBS = [
- 'expat',
-])
+if env['dri']:
+ mesautil_sources += source_lists['XMLCONFIG_FILES']
+
+ mesautilenv.AppendUnique(LIBS = [
+ 'expat',
+ ])
mesautil = mesautilenv.ConvenienceLibrary(
target = 'mesautil',