mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 15:11:35 +00:00
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 863f58503bee..b778d5023208 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -501,11 +501,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
|
|
KBUILD_AFLAGS += $(call cc-option,-fno-PIE)
|
|
|
|
# check for 'asm goto'
|
|
-ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
|
|
CC_HAVE_ASM_GOTO := 1
|
|
KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
|
|
KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
|
|
-endif
|
|
|
|
# The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.
|
|
# Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.
|
|
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
|
|
index 065324a8046f..d09c67194549 100644
|
|
--- a/scripts/Kbuild.include
|
|
+++ b/scripts/Kbuild.include
|
|
@@ -216,11 +216,8 @@ cc-disable-warning = $(call try-run-cached,\
|
|
cc-name = $(call shell-cached,$(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc)
|
|
|
|
# cc-version
|
|
-cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
|
|
|
|
# cc-fullversion
|
|
-cc-fullversion = $(shell $(CONFIG_SHELL) \
|
|
- $(srctree)/scripts/gcc-version.sh -p $(CC))
|
|
|
|
# cc-ifversion
|
|
# Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
|