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
531 than or equal to gcc 3.0.531 than or equal to gcc 3.0.
532 532
533 cc-ifversion533 cc-ifversion
534 cc-ifversion tests the version of $(CC) and equals last argument if534 cc-ifversion tests the version of $(CC) and equals the fourth parameter
535 version expression is true.535 if version expression is true, or the fifth (if given) if the version
536 expression is false.
536 537
537 Example:538 Example:
538 #fs/reiserfs/Makefile539 #fs/reiserfs/Makefile
scripts/Kbuild.include+2−2
@@ -137,7 +137,7 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \ · 136 unmodified lines
137 137
138# cc-ifversion138# cc-ifversion
139# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)139# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
140cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3))140cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
141 141
142# cc-ldoption142# cc-ldoption
143# Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)143# 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
160 160
161# ld-ifversion161# ld-ifversion
162# Usage: $(call ld-ifversion, -ge, 22252, y)162# Usage: $(call ld-ifversion, -ge, 22252, y)
163ld-ifversion = $(shell [ $(ld-version) $(1) $(2) ] && echo $(3))163ld-ifversion = $(shell [ $(ld-version) $(1) $(2) ] && echo $(3) || echo $(4))
164 164
165######165######
166 166