Mesa (master): scons: Conditionally use DRM module on pipe-loader.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Sat Nov 21 21:20:27 UTC 2015


Module: Mesa
Branch: master
Commit: 02afbd247620bd51a5b1661ced9b01a865136484
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=02afbd247620bd51a5b1661ced9b01a865136484

Author: Jose Fonseca <jfonseca at vmware.com>
Date:   Sat Nov 21 21:19:57 2015 +0000

scons: Conditionally use DRM module on pipe-loader.

Fixes non Linux builds.

Trivial.

---

 src/gallium/auxiliary/pipe-loader/SConscript |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gallium/auxiliary/pipe-loader/SConscript b/src/gallium/auxiliary/pipe-loader/SConscript
index 393b602..c611fb8 100644
--- a/src/gallium/auxiliary/pipe-loader/SConscript
+++ b/src/gallium/auxiliary/pipe-loader/SConscript
@@ -17,12 +17,11 @@ env.Append(CPPDEFINES = [
 
 source = env.ParseSourceList('Makefile.sources', 'COMMON_SOURCES')
 
-#if HAVE_LIBDRM
-source += env.ParseSourceList('Makefile.sources', 'DRM_SOURCES')
+if env['HAVE_DRM']:
+    source += env.ParseSourceList('Makefile.sources', 'DRM_SOURCES')
 
-env.PkgUseModules('DRM')
-env.Append(LIBS = [libloader])
-#endif
+    env.PkgUseModules('DRM')
+    env.Append(LIBS = [libloader])
 
 pipe_loader = env.ConvenienceLibrary(
     target = 'pipe_loader',




More information about the mesa-commit mailing list