Skip to content

Commit 6dcb4e5

Browse files
masahir0ymichal42
authored andcommitted
kbuild: allow cc-ifversion to have the argument for false condition
The macro "try-run" can have an argument for each of true and false cases. Having an argument for the false case of cc-ifversion (and ld-ifversion) would be useful too. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
1 parent 3df8094 commit 6dcb4e5

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

Documentation/kbuild/makefiles.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,8 +531,9 @@ more details, with real examples.
531531
than or equal to gcc 3.0.
532532

533533
cc-ifversion
534-
cc-ifversion tests the version of $(CC) and equals last argument if
535-
version expression is true.
534+
cc-ifversion tests the version of $(CC) and equals the fourth parameter
535+
if version expression is true, or the fifth (if given) if the version
536+
expression is false.
536537

537538
Example:
538539
#fs/reiserfs/Makefile

scripts/Kbuild.include

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \
137137

138138
# cc-ifversion
139139
# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
140-
cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3))
140+
cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
141141

142142
# cc-ldoption
143143
# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
@@ -160,7 +160,7 @@ ld-version = $(shell $(LD) --version | $(srctree)/scripts/ld-version.sh)
160160

161161
# ld-ifversion
162162
# Usage: $(call ld-ifversion, -ge, 22252, y)
163-
ld-ifversion = $(shell [ $(ld-version) $(1) $(2) ] && echo $(3))
163+
ld-ifversion = $(shell [ $(ld-version) $(1) $(2) ] && echo $(3) || echo $(4))
164164

165165
######
166166

0 commit comments

Comments
 (0)