diff options
author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-12-25 00:31:27 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2015-01-09 11:25:44 -0500 |
commit | 6dcb4e5edf39e3b65a75ca76f087b2fdbee8a808 (patch) | |
tree | 1a876190fd070812f7bfe2b446d02f074e5075e1 /scripts | |
parent | 3df8094727bd1972eb8e231e56ecdbd6e8fb2210 (diff) |
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>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Kbuild.include | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index ddf0ebdc2ca8..d3437b82ac25 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include | |||
@@ -137,7 +137,7 @@ cc-fullversion = $(shell $(CONFIG_SHELL) \ | |||
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) | |||
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 | ||