Skip to content
This repository has been archived by the owner on Sep 24, 2020. It is now read-only.

Rebase 4.19-rc8 patches onto 4.19 #271

Merged
merged 2 commits into from
Oct 22, 2018
Merged

Rebase 4.19-rc8 patches onto 4.19 #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
032844e
kbuild: derive relative path for KBUILD_SRC from CURDIR
Nov 25, 2015
175b5d6
tools/objtool/Makefile: Don't fail on fallthrough with new GCCs
dm0- Feb 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

# Invoke a second make in the output directory, passing relevant variables
sub-make:
$(Q)$(MAKE) -C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR) \
$(Q)$(MAKE) -C $(KBUILD_OUTPUT) \
KBUILD_SRC=$(shell realpath --relative-to=$(KBUILD_OUTPUT) $(CURDIR)) \
-f $(CURDIR)/Makefile $(filter-out _all sub-make,$(MAKECMDGOALS))

# Leave processing to above invocation of make
Expand Down
3 changes: 3 additions & 0 deletions tools/lib/subcmd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ ifneq ($(WERROR),0)
CFLAGS += -Werror
endif

# Don't fail on fallthrough with newer GCCs.
CFLAGS += -Wno-error=implicit-fallthrough

CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

CFLAGS += -I$(srctree)/tools/include/
Expand Down