diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 12:24:00 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2017-02-20 17:20:05 -0500 |
| commit | 60709c093ed39aadb0f09972ebbc96dc34eb372e (patch) | |
| tree | 983681311986070971d3756d9f8e75868aa7bb9a /Makefile | |
| parent | 7323f0d2881bbd426ce6bc0a956ef9e739ffe767 (diff) | |
| parent | 0839ffb83e44e5ff1843e932592525fc2bff23ff (diff) | |
| download | op-kernel-dev-60709c093ed39aadb0f09972ebbc96dc34eb372e.zip op-kernel-dev-60709c093ed39aadb0f09972ebbc96dc34eb372e.tar.gz | |
nfsd: merge stable fix into main nfsd branch
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ VERSION = 4 PATCHLEVEL = 10 SUBLEVEL = 0 -EXTRAVERSION = -rc6 +EXTRAVERSION = -rc7 NAME = Fearless Coyote # *DOCUMENTATION* @@ -797,7 +797,7 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) KBUILD_ARFLAGS := $(call ar-option,D) # check for 'asm goto' -ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) +ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO endif |
