mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-24 15:02:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct name and documentation of preprocessor symbol check function

Browse Source 
It's not remove_unset_options, it's remove_enabled_options (or
keep_disabled_options).

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2023-12-22 18:30:37 +01:00
parent 7602298a16
commit f3316f132b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/common.make
View File

@ -31,19 +31,19 @@ ifdef WINDOWS
WINDOWS_BUILD=1 WINDOWS_BUILD=1
endif endif
## Usage: $(call remove_unset_options,PREPROCESSOR_INPUT) ## Usage: $(call remove_enabled_options,PREPROCESSOR_INPUT)
## Remove the preprocessor symbols that are not set in the current configuration ## Remove the preprocessor symbols that are set in the current configuration
## from PREPROCESSOR_INPUT. Also normalize whitespace. ## from PREPROCESSOR_INPUT. Also normalize whitespace.
## Example: ## Example:
## $(call remove_unset_options,MBEDTLS_FOO MBEDTLS_BAR) ## $(call remove_set_options,MBEDTLS_FOO MBEDTLS_BAR)
## This expands to an empty string "" if MBEDTLS_FOO and MBEDTLS_BAR are both ## This expands to an empty string "" if MBEDTLS_FOO and MBEDTLS_BAR are both
## disabled, to "MBEDTLS_FOO" if MBEDTLS_BAR is enabled but MBEDTLS_FOO is ## enabled, to "MBEDTLS_FOO" if MBEDTLS_BAR is enabled but MBEDTLS_FOO is
## disabled, etc. ## disabled, etc.
## ##
## This only works with a Unix-like shell environment (Bourne/POSIX-style shell ## This only works with a Unix-like shell environment (Bourne/POSIX-style shell
## and standard commands) and a Unix-like compiler (supporting -E). In ## and standard commands) and a Unix-like compiler (supporting -E). In
## other environments, the output is likely to be empty. ## other environments, the output is likely to be empty.
define remove_unset_options define remove_enabled_options
$(strip $(shell $(strip $(shell
exec 2>/dev/null; exec 2>/dev/null;
{ echo '#include <mbedtls/build_info.h>'; echo $(1); } | { echo '#include <mbedtls/build_info.h>'; echo $(1); } |
@ -66,11 +66,11 @@ else # Not building for Windows
SHARED_SUFFIX= SHARED_SUFFIX=
ifndef THREADING ifndef THREADING
# Auto-detect configurations with pthread. # Auto-detect configurations with pthread.
# If the call to remove_unset_options returns "control", the symbols # If the call to remove_enabled_options returns "control", the symbols
# are confirmed set and we link with pthread. # are confirmed set and we link with pthread.
# If the auto-detection fails, the result of the call is empty and # If the auto-detection fails, the result of the call is empty and
# we keep THREADING undefined. # we keep THREADING undefined.
ifeq (control,$(call remove_unset_options,control MBEDTLS_THREADING_C MBEDTLS_THREADING_PTHREAD)) ifeq (control,$(call remove_enabled_options,control MBEDTLS_THREADING_C MBEDTLS_THREADING_PTHREAD))
THREADING := pthread THREADING := pthread
endif endif
endif endif