diff options
| author | Matt Turner <mattst88@gmail.com> | 2017-10-01 23:20:55 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2017-10-02 19:41:22 -0700 |
| commit | 74b5568978968f580b9809135198db1015bc55b7 (patch) | |
| tree | 87b5ea4370812aa1f583dca52b15abcdf6f3e517 | |
| parent | 8d02abd0feaaef28a35d89903bd534a7f27c38d7 (diff) | |
| download | mesa-74b5568978968f580b9809135198db1015bc55b7.tar.gz | |
build: Remove HAVE_DLOPEN
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | Android.common.mk | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | src/mesa/SConscript | 4 |
4 files changed, 2 insertions, 8 deletions
diff --git a/Android.common.mk b/Android.common.mk index 4d5daf8e9dd..483f6c5be2e 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -64,7 +64,6 @@ LOCAL_CFLAGS += \ -DHAVE___BUILTIN_UNREACHABLE \ -DHAVE_PTHREAD=1 \ -DHAVE_DLADDR \ - -DHAVE_DLOPEN \ -DHAVE_DL_ITERATE_PHDR \ -DMAJOR_IN_SYSMACROS \ -fvisibility=hidden \ diff --git a/configure.ac b/configure.ac index cfc97d9f061..903a3979d47 100644 --- a/configure.ac +++ b/configure.ac @@ -831,9 +831,9 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([[ dnl Check to see if dlopen is in default libraries (like Solaris, which dnl has it in libc), or if libdl is needed to get it. -AC_CHECK_FUNC([dlopen], [DEFINES="$DEFINES -DHAVE_DLOPEN"], +AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], - [DEFINES="$DEFINES -DHAVE_DLOPEN"; DLOPEN_LIBS="-ldl"])]) + [DLOPEN_LIBS="-ldl"])]) AC_SUBST([DLOPEN_LIBS]) dnl Check if that library also has dladdr diff --git a/meson.build b/meson.build index 1e0b95fcb16..ecd08651ff0 100644 --- a/meson.build +++ b/meson.build @@ -264,7 +264,6 @@ if cc.has_function('dlopen') else dep_dl = cc.find_library('dl') endif -pre_args += '-DHAVE_DLOPEN' if not cc.has_function('dladdr', dependencies : dep_dl) error('dl library doesn\'t have dladdr') diff --git a/src/mesa/SConscript b/src/mesa/SConscript index b63e15a3f05..ba98ad4323c 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -31,10 +31,6 @@ if env['platform'] == 'windows': if not env['gles']: # prevent _glapi_* from being declared __declspec(dllimport) env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS']) -else: - env.Append(CPPDEFINES = [ - ('HAVE_DLOPEN', '1'), - ]) # parse Makefile.sources source_lists = env.ParseSourceList('Makefile.sources') |