Merge pull request #1265 from sghctoma/conditional-b_lundef

Set b_lundef to false on FreeBSD in meson.build
This commit is contained in:
emersion 2018-09-28 16:37:09 +02:00 committed by GitHub
commit 0347d542ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions

View file

@ -74,9 +74,6 @@ Run these commands:
meson build meson build
ninja -C build ninja -C build
On FreeBSD, you need to pass an extra flag to prevent a linking error:
`meson build -D b_lundef=false`.
Install like so: Install like so:
sudo ninja -C build install sudo ninja -C build install

View file

@ -3,7 +3,7 @@ project(
'c', 'c',
version: '0.0.1', version: '0.0.1',
license: 'MIT', license: 'MIT',
meson_version: '>=0.47.1', meson_version: '>=0.48.0',
default_options: [ default_options: [
'c_std=c11', 'c_std=c11',
'warning_level=2', 'warning_level=2',
@ -111,6 +111,12 @@ wlr_deps += [
math, math,
] ]
if host_machine.system() == 'freebsd'
override_options = ['b_lundef=false']
else
override_options = []
endif
symbols_file = 'wlroots.syms' symbols_file = 'wlroots.syms'
symbols_flag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), symbols_file) symbols_flag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), symbols_file)
lib_wlr = library( lib_wlr = library(
@ -122,6 +128,7 @@ lib_wlr = library(
install: true, install: true,
link_args : symbols_flag, link_args : symbols_flag,
link_depends: symbols_file, link_depends: symbols_file,
override_options: override_options,
) )
wlroots = declare_dependency( wlroots = declare_dependency(