Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meta: rename ANSI option to ANSI tests option #1093

Closed
wants to merge 1 commit into from
Closed

meta: rename ANSI option to ANSI tests option #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ no_headers = get_option('mlibc_no_headers')
library_type = get_option('default_library')
build_tests = get_option('build_tests')
build_tests_host_libc = get_option('build_tests_host_libc')
disable_ansi_option = get_option('disable_ansi_option')
disable_ansi_option_tests = get_option('disable_ansi_option_tests')
disable_posix_option = get_option('disable_posix_option')
disable_linux_option = get_option('disable_linux_option')
disable_iconv_option = get_option('disable_iconv_option')
Expand Down Expand Up @@ -264,7 +264,6 @@ endif
# Configuration based on enabled options.
#----------------------------------------------------------------------------------------

mlibc_conf.set10('__MLIBC_ANSI_OPTION', not disable_ansi_option)
mlibc_conf.set10('__MLIBC_POSIX_OPTION', not disable_posix_option)
mlibc_conf.set10('__MLIBC_LINUX_OPTION', not disable_linux_option)
mlibc_conf.set10('__MLIBC_INTL_OPTION', not disable_intl_option)
Expand All @@ -274,10 +273,8 @@ mlibc_conf.set10('__MLIBC_CRYPT_OPTION', not disable_crypt_option)
mlibc_conf.set10('__MLIBC_BSD_OPTION', not disable_bsd_option)
mlibc_conf.set10('__MLIBC_SYSDEP_HAS_BITS_SYSCALL_H', provides_bits_syscall_h)

if not disable_ansi_option
rtld_include_dirs += include_directories('options/ansi/include')
libc_include_dirs += include_directories('options/ansi/include')
endif
rtld_include_dirs += include_directories('options/ansi/include')
libc_include_dirs += include_directories('options/ansi/include')

if not disable_posix_option
rtld_include_dirs += include_directories('options/posix/include')
Expand Down Expand Up @@ -537,7 +534,7 @@ summary(summary_info, bool_yn: true, section: 'tests')

summary_info = {}
summary_info += {'headers-only': headers_only}
summary_info += {'ANSI option': not disable_ansi_option}
summary_info += {'ANSI tests option': not disable_ansi_option_tests}
summary_info += {'crypt option': not disable_crypt_option}
summary_info += {'POSIX option': not disable_posix_option}
summary_info += {'Linux option': not disable_linux_option}
Expand Down
2 changes: 1 addition & 1 deletion meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ option('headers_only', type : 'boolean', value : false)
option('mlibc_no_headers', type : 'boolean', value : false)
option('build_tests', type: 'boolean', value : false)
option('build_tests_host_libc', type: 'boolean', value : true)
option('disable_ansi_option', type: 'boolean', value : false)
option('disable_ansi_option_tests', type: 'boolean', value : false)
option('disable_crypt_option', type: 'boolean', value : false)
option('disable_posix_option', type: 'boolean', value : false)
option('disable_linux_option', type: 'boolean', value : false)
Expand Down
1 change: 0 additions & 1 deletion mlibc-config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef _MLIBC_CONFIG_H
#define _MLIBC_CONFIG_H

#mesondefine __MLIBC_ANSI_OPTION
#mesondefine __MLIBC_BSD_OPTION
#mesondefine __MLIBC_POSIX_OPTION
#mesondefine __MLIBC_LINUX_OPTION
Expand Down
4 changes: 0 additions & 4 deletions options/ansi/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@

if disable_ansi_option
subdir_done()
endif

ansi_sources = files(
'generic/stdlib-stubs.cpp',
'generic/assert-stubs.cpp',
Expand Down
4 changes: 1 addition & 3 deletions options/internal/include/mlibc/all-sysdeps.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
#include <mlibc-config.h>
#include <internal-config.h>

#if __MLIBC_ANSI_OPTION
# include <mlibc/ansi-sysdeps.hpp>
#endif /* __MLIBC_ANSI_OPTION */
#include <mlibc/ansi-sysdeps.hpp>

#if __MLIBC_POSIX_OPTION
# include <mlibc/posix-sysdeps.hpp>
Expand Down
2 changes: 1 addition & 1 deletion tests/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ foreach test_name : all_test_cases
test_short_name = test_name.split('/')[1]
test_exec_name = test_name.replace('/', '-')

if test_subdir == 'ansi' and disable_ansi_option
if test_subdir == 'ansi' and disable_ansi_option_tests
continue
elif test_subdir == 'bsd' and disable_bsd_option
continue
Expand Down
Loading