traxys/Nixfiles
1
0
Fork 0
mirror of https://github.com/traxys/Nixfiles.git synced 2026-05-13 22:35:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pkgs: Fix update of mesonlsp

Browse source
This commit is contained in:
traxys 2024-05-07 14:40:12 +02:00
parent dd0c13270e
commit 02932d842e
3 changed files with 49 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

37
pkgs/mesonlsp/build_flags.patch Normal file
View file

@ -0,0 +1,37 @@
diff --git a/meson.build b/meson.build
index ff0f0c3e..82c4fbe8 100644
--- a/meson.build
+++ b/meson.build
@@ -34,7 +34,11 @@ if buildtype != 'plain'
]
if cc.get_id() == 'gcc'
- extra_flags += [
+ extra_c_flags += [
+ '-Wshadow=local',
+ '-fstack-clash-protection',
+ ]
+ extra_cxx_flags += [
'-Wshadow=local',
'-fstack-clash-protection',
]
@@ -44,7 +48,8 @@ if buildtype != 'plain'
extra_flags += [
'-frecord-gcc-switches',
]
- extra_flags += cc.get_supported_arguments('-mshstk', '-fcf-protection=full')
+ extra_c_flags += cc.get_supported_arguments('-mshstk', '-fcf-protection=full')
+ extra_cxx_flags += cxx.get_supported_arguments('-mshstk', '-fcf-protection=full')
endif
global_link_args = host_machine.system() == 'windows' ? [] : ['-rdynamic']
@@ -54,7 +59,8 @@ if buildtype != 'plain'
global_link_args += ['-Wl,-ld_classic']
endif
- add_global_arguments(extra_flags, language: ['c', 'cpp'])
+ add_global_arguments(extra_flags + extra_c_flags, language: ['c'])
+ add_global_arguments(extra_flags + extra_cxx_flags, language: ['cpp'])
add_global_link_arguments(global_link_args, language: ['c', 'cpp'])
endif