diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-05-11 14:38:52 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2014-05-23 15:24:01 +0100 |
| commit | ff90a8784cf22ada7bba75f90460b063818abda7 (patch) | |
| tree | c9c83e89685a4925acdbc7158d39995fa0bff445 /src/gallium/targets | |
| parent | e0372239a5b716de21b5f4c7a4a7d8b4a74a51cb (diff) | |
Fix build for darwin
Fix build for darwin, when ./configured --disable-driglx-direct
- darwin ld doesn't support -Bsymbolic or --version-script, so check if ld
supports those options before using them
- define GLX_ALIAS_UNSUPPORTED as config/darwin used to, as aliasing of non-weak
symbols isn't supported
- default to -with-dri-drivers=swrast
v2:
Use -Wl,-Bsymbolic, as before, not -Bsymbolic
Test that ld --version-script works, rather than just looking for it in ld --help
Don't use -Wl,--no-undefined on darwin, either
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/targets/opencl/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/targets/pipe-loader/Makefile.am | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 7a2e5552205..bd18f995161 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -48,7 +48,9 @@ AM_LDFLAGS = \ -module \ -no-undefined \ -avoid-version \ +if HAVE_LD_VERSION_SCRIPT -Wl,--version-script=$(top_srcdir)/src/gallium/targets/egl-static/egl.sym \ +endif $(GC_SECTIONS) \ $(LD_NO_UNDEFINED) diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index a8945a97f1c..bfc03073b3c 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -67,7 +67,9 @@ gbm_gallium_drm_la_LDFLAGS = \ -module \ -no-undefined \ -avoid-version \ +if HAVE_LD_VERSION_SCRIPT -Wl,--version-script=$(top_srcdir)/src/gallium/targets/gbm/gbm.sym \ +endif $(GC_SECTIONS) \ $(LD_NO_UNDEFINED) diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index ba45aee81c1..f8c591d6281 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -6,7 +6,9 @@ lib@OPENCL_LIBNAME@_la_LDFLAGS = \ $(LLVM_LDFLAGS) \ -no-undefined \ -version-number 1:0 \ +if HAVE_LD_VERSION_SCRIPT -Wl,--version-script=$(top_srcdir)/src/gallium/targets/opencl/opencl.sym \ +endif $(GC_SECTIONS) \ $(LD_NO_UNDEFINED) diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am index 328069416d1..93e497f9943 100644 --- a/src/gallium/targets/pipe-loader/Makefile.am +++ b/src/gallium/targets/pipe-loader/Makefile.am @@ -47,7 +47,9 @@ AM_LDFLAGS = \ -module \ -no-undefined \ -avoid-version \ +if HAVE_LD_VERSION_SCRIPT -Wl,--version-script=$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.sym \ +endif $(GC_SECTIONS) \ $(LD_NO_UNDEFINED) |