diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-10-30 13:22:12 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-10-31 10:58:15 +0100 |
| commit | 2908e4c60a4857c99c9803ca1fd8e6bb18fcb7a5 (patch) | |
| tree | e19175598f772e710689a1c1b1debd8d7d2c8083 /lib/meson.build | |
| parent | 6c68c30ef88187a08ec6dff2d77eb07f26eb48c8 (diff) | |
lib: Make libunwind optional again
Apparently it's really not great to require it for a bunch of
platforms. Requested by Sean and Eric.
v2: Use combo option (Petri).
v3: Fix the right option (Petri)
v4: try a bit harder ...
v5: Even more simplification (Dylan)
Cc: Dylan Baker <dylan@pnwbakers.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net> (v1)
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Cc: Sean Paul <sean@poorly.run>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'lib/meson.build')
| -rw-r--r-- | lib/meson.build | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/meson.build b/lib/meson.build index 7e2c9b7a..8961ca49 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -59,7 +59,6 @@ lib_deps = [ libkmod, libprocps, libudev, - libunwind, libdw, pciaccess, pthreads, @@ -76,6 +75,12 @@ else inc = [ inc, include_directories('stubs/drm') ] endif +if libunwind.found() + lib_deps += libunwind +else + inc = [ inc, include_directories('stubs/libunwind') ] +endif + if valgrind.found() lib_deps += valgrind endif |