From: Vinson Lee <vlee@vmware.com>
Date: Mon, 26 Apr 2010 08:08:34 +0000 (-0700)
Subject: scons: Include headers from the local include directory first.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5fd97573e3c35d5e7e2b17dc2795dc9292ea944c;p=mesa.git

scons: Include headers from the local include directory first.

Certain headers, such as GL/glew.h, are in both the Mesa include and the
default installed include directories. On recent distros the needed
symbols can be found in both places. On older distros the installed
headers could be lacking symbols, so for a header that exists in both
places, the local one should be found first.
---

diff --git a/SConstruct b/SConstruct
index de3f6ea5c33..3a4ff9a3fac 100644
--- a/SConstruct
+++ b/SConstruct
@@ -113,8 +113,10 @@ if env['llvm'] and 'llvmpipe' not in env['drivers']:
     env['drivers'].append('llvmpipe')
 
 # Includes
-env.Append(CPPPATH = [
+env.Prepend(CPPPATH = [
 	'#/include',
+])
+env.Append(CPPPATH = [
 	'#/src/gallium/include',
 	'#/src/gallium/auxiliary',
 	'#/src/gallium/drivers',