History

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.

Masahiro Yamada committed 11 years ago

Commit 6dcb4e51 parent 3df80942 files · +5 −4Browse files

Unified · Split

2 files
  1. Documentation/kbuild/makefiles.txt +3 −2
  2. scripts/Kbuild.include +2 −2
Documentation/kbuild/makefiles.txt+3−2
@@ -531,8 +531,9 @@ more details, with real examples. · 530 unmodified lines
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+2−2
@@ -137,7 +137,7 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \ · 136 unmodified lines
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) · 16 unmodified lines
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