diff options
| author | Eric Anholt <[email protected]> | 2018-11-15 13:41:34 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2018-11-16 15:37:47 -0800 |
| commit | 7076e9f116c2060a7f28680178d96c188c7177df (patch) | |
| tree | be92c2e6cde5f68a68e6a1907d721496a815fbfc /src/glx | |
| parent | d031d5c9994bd67329f2b2c7e9a4457af671b05a (diff) | |
glx: Remove an old DEFAULT_DRIVER_DIR default.
You can tell by "Mesa/configs/default" how old this is. Your build system
really has to provide the DEFAULT_DRIVER_DIR, or other loaders will break.
v2: Move the bad (non-prefix-dependent) define to the SConscript to avoid
breaking it.
Reviewed-by: Eric Engestrom <[email protected]> (v1)
Reviewed-by: Emil Velikov <[email protected]> (v1)
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/SConscript | 3 | ||||
| -rw-r--r-- | src/glx/dri_common.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/glx/SConscript b/src/glx/SConscript index 8ce17715814..83c62e22f8c 100644 --- a/src/glx/SConscript +++ b/src/glx/SConscript @@ -24,9 +24,10 @@ env.Prepend(CPPPATH = [ env.Append(CPPDEFINES = [ '_REENTRANT', - #('DEFAULT_DRIVER_DIR', 'DRI_DRIVER_SEARCH_DIR') ]) +env.Append(CPPDEFINES = ['DEFAULT_DRIVER_DIR=\\"/usr/local/lib/dri\\"']) + env.Prepend(LIBS = [ libloader, mesautil, diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index ab5d6c5bc03..08923d7efd5 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -77,11 +77,6 @@ dri_message(int level, const char *f, ...) #define GL_LIB_NAME "libGL.so.1" #endif -#ifndef DEFAULT_DRIVER_DIR -/* this is normally defined in Mesa/configs/default with DRI_DRIVER_SEARCH_PATH */ -#define DEFAULT_DRIVER_DIR "/usr/local/lib/dri" -#endif - /** * Try to \c dlopen the named driver. * |