Skip to content

Commit

Permalink
kbuild,gcov: remove unnecessary workaround
Browse files Browse the repository at this point in the history
Since commit 371fdc7 (kbuild: collect shorthands into
scripts/Kbuild.include), scripts/Makefile.clean includes
scripts/Kbuild.include.

The workaround and the comment block in kernel/gcov/Makefile
are no longer necessary.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
  • Loading branch information
Masahiro Yamada authored and Michal Marek committed Jan 9, 2015
1 parent 665d92e commit 842857d
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions kernel/gcov/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,7 @@ ifeq ($(CONFIG_GCOV_FORMAT_3_4),y)
else ifeq ($(CONFIG_GCOV_FORMAT_4_7),y)
cc-ver := 0407
else
# Use cc-version if available, otherwise set 0
#
# scripts/Kbuild.include, which contains cc-version function, is not included
# during make clean "make -f scripts/Makefile.clean obj=kernel/gcov"
# Meaning cc-ver is empty causing if-lt test to fail with
# "/bin/sh: line 0: [: -lt: unary operator expected" error mesage.
# This has no affect on the clean phase, but the error message could be
# confusing/annoying. So this dummy workaround sets cc-ver to zero if cc-version
# is not available. We can probably move if-lt to Kbuild.include, so it's also
# not defined during clean or to include Kbuild.include in
# scripts/Makefile.clean. But the following workaround seems least invasive.
cc-ver := $(if $(cc-version),$(cc-version),0)
cc-ver := $(cc-version)
endif

obj-$(CONFIG_GCOV_KERNEL) := base.o fs.o
Expand Down

0 comments on commit 842857d

Please sign in to comment.