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.
Showing the changes to scripts/Kbuild.include (1 of 2 files). Show all
Unified · Split
| @@ -137,7 +137,7 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \ · 136 unmodified lines | |||
| 137 | 137 | ||
| 138 | # cc-ifversion | 138 | # cc-ifversion |
| 139 | # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) | 139 | # 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)) |
| 141 | 141 | ||
| 142 | # cc-ldoption | 142 | # 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-ifversion | 161 | # ld-ifversion |
| 162 | # Usage: $(call ld-ifversion, -ge, 22252, y) | 162 | # 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)) |
| 164 | 164 | ||
| 165 | ###### | 165 | ###### |
| 166 | 166 | ||