blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(meson): Support libc++ >=9.0.0 

From LLVM libc++ documentation:
"Prior to LLVM 9.0, libc++ provides the implementation of the
filesystem library in a separate static library."

Now the filesystem library (not the experimental one) is shipped
inside the libc++.so library.

Check if '-lc++fs' link flag is needed and supported before adding
it.
This commit is contained in:
Danilo Spinella 2020-02-11 14:38:05 +01:00
parent aae105c998
commit 16c68ee132
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@ -9,6 +9,8 @@ project(
], ],
) )
compiler = meson.get_compiler('cpp')
cpp_args = [] cpp_args = []
cpp_link_args = [] cpp_link_args = []
@ -16,12 +18,13 @@ if get_option('libcxx')
cpp_args += ['-stdlib=libc++'] cpp_args += ['-stdlib=libc++']
cpp_link_args += ['-stdlib=libc++', '-lc++abi'] cpp_link_args += ['-stdlib=libc++', '-lc++abi']
cpp_link_args += ['-lc++fs'] if compiler.has_link_argument('-lc++fs')
cpp_link_args += ['-lc++fs']
endif
else else
cpp_link_args += ['-lstdc++fs'] cpp_link_args += ['-lstdc++fs']
endif endif
compiler = meson.get_compiler('cpp')
git = find_program('git', required: false) git = find_program('git', required: false)
if not git.found() if not git.found()