Skip to content

Commit 1b6f736

Browse files
notxvilkaXVilka
andcommitted
build: enable GNU C99 extension by default (#5099)
Co-authored-by: Anton Kochkov <anton.kochkov@gmail.com>
1 parent 6fcb85d commit 1b6f736

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ jobs:
368368
working-directory: rizin
369369
- name: Build
370370
run: |
371-
meson setup --prefix=/usr build && ninja -C build
371+
meson setup -Dc_std=gnu99 --prefix=/usr build && ninja -C build
372372
working-directory: rizin
373373
- name: Install
374374
run: ninja -C build install
@@ -450,7 +450,7 @@ jobs:
450450
run: find subprojects -name '*.wrap' | xargs sed -i '/^depth = 1$/d'
451451
working-directory: rizin
452452
- name: Build with Meson + Ninja
453-
run: meson setup --prefix=/usr build && ninja -C build
453+
run: meson setup -Dc_std=gnu99 --prefix=/usr build && ninja -C build
454454
working-directory: rizin
455455
- name: Install with Ninja
456456
run: ninja -C build install

meson.build

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ project('rizin', 'c',
55
default_options: [
66
'buildtype=debugoptimized',
77
'b_vscrt=from_buildtype',
8-
'c_std=c99',
98
'warning_level=1',
109
]
1110
)
@@ -91,6 +90,16 @@ if cc.has_argument('-Wenum-compare')
9190
add_project_arguments('-DCC_SUPPORTS_W_ENUM_COMPARE', language: ['c', 'cpp'])
9291
endif
9392

93+
if cc.has_argument('-std=gnu99')
94+
add_project_arguments('-std=gnu99', language: ['c', 'cpp'])
95+
elif cc.has_argument('--std=gnu99')
96+
add_project_arguments('--std=gnu99', language: ['c', 'cpp'])
97+
elif cc.has_argument('-std=c99')
98+
add_project_arguments('-std=c99', language: ['c', 'cpp'])
99+
elif cc.has_argument('--std=c99')
100+
add_project_arguments('--std=c99', language: ['c', 'cpp'])
101+
endif
102+
94103
# Sanitize correct usage of rz_strf()
95104
if cc.has_argument('-Werror=sizeof-pointer-memaccess')
96105
add_project_arguments('-Werror=sizeof-pointer-memaccess', language: ['c', 'cpp'])

0 commit comments

Comments
 (0)