From 8e6645eda01a89664571f79887c8c213018f46e7 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Thu, 28 Nov 2019 12:56:15 +0800
Subject: [PATCH] add secondary check for libiberty
---
meson.build | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/meson.build b/meson.build
index 90918424d..fb783dda9 100644
--- a/meson.build
+++ b/meson.build
@@ -565,16 +565,19 @@ endif
##########################
# location of libiberty.h
#
-if compiler.has_header('libiberty.h',
- args: cflags,
- include_directories: include_directories(incdirs))
- # Fedora
- cflags += '-D__HAVE_LIBIBERTYH__'
-elif compiler.has_header('libiberty/libiberty.h',
- args: cflags,
- include_directories: include_directories(incdirs))
- # Debian and derivatives e.g. Ubuntu
- cflags += '-D__HAVE_LIBIBERTY_LIBIBERTYH__'
+if compiler.find_library('iberty',
+ required:false)
+ if compiler.has_header('libiberty.h',
+ args: cflags,
+ include_directories: include_directories(incdirs))
+ # Fedora
+ cflags += '-D__HAVE_LIBIBERTYH__'
+ elif compiler.has_header('libiberty/libiberty.h',
+ args: cflags,
+ include_directories: include_directories(incdirs))
+ # Debian and derivatives e.g. Ubuntu
+ cflags += '-D__HAVE_LIBIBERTY_LIBIBERTYH__'
+ endif
endif
############################################################
--
GitLab