From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Mon, 31 Jul 2017 15:17:44 +0000 (+0200)
Subject: Attempt to fix AppVeyor build, round 2
X-Git-Tag: android-x86-8.1-r1~11057
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=90c8f17cf8fbe696dede841b0f3faca2556854fe;p=android-x86%2Fexternal-mesa.git

Attempt to fix AppVeyor build, round 2
---

diff --git a/src/util/SConscript b/src/util/SConscript
index 00bd89c0138..0c3c98a5f4c 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',