diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-19 13:07:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-19 13:07:08 -0500 |
commit | 27a22ee4c7d5839fd7e3e441c9d675c8a5c4c22c (patch) | |
tree | 309fd7788b0695c5273416840d7a7a08dcecda5c /arch/parisc | |
parent | b2b89ebfc0f0287e20516a5443d93af309b800cf (diff) | |
parent | a75f8b8dab0f73459fa47a1daa10c84c4e8400a8 (diff) |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild updates from Michal Marek:
- several cleanups in kbuild
- serialize multiple *config targets so that 'make defconfig kvmconfig'
works
- The cc-ifversion macro got support for an else-branch
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild,gcov: simplify kernel/gcov/Makefile more
kbuild: allow cc-ifversion to have the argument for false condition
kbuild,gcov: simplify kernel/gcov/Makefile
kbuild,gcov: remove unnecessary workaround
kbuild: do not add $(call ...) to invoke cc-version or cc-fullversion
kbuild: fix cc-ifversion macro
kbuild: drop $(version_h) from MRPROPER_FILES
kbuild: use mixed-targets when two or more config targets are given
kbuild: remove redundant line from bounds.h/asm-offsets.h
kbuild: merge bounds.h and asm-offsets.h rules
kbuild: Drop support for clean-rule
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index 91fbb6ee702c..965a0999fc4c 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile | |||
@@ -148,7 +148,7 @@ endef | |||
148 | # we require gcc 3.3 or above to compile the kernel | 148 | # we require gcc 3.3 or above to compile the kernel |
149 | archprepare: checkbin | 149 | archprepare: checkbin |
150 | checkbin: | 150 | checkbin: |
151 | @if test "$(call cc-version)" -lt "0303"; then \ | 151 | @if test "$(cc-version)" -lt "0303"; then \ |
152 | echo -n "Sorry, GCC v3.3 or above is required to build " ; \ | 152 | echo -n "Sorry, GCC v3.3 or above is required to build " ; \ |
153 | echo "the kernel." ; \ | 153 | echo "the kernel." ; \ |
154 | false ; \ | 154 | false ; \ |