mirror of
https://github.com/gentoo-mirror/guru.git
synced 2025-04-20 00:08:58 -04:00
74 lines
3.8 KiB
Diff
74 lines
3.8 KiB
Diff
https://bugs.gentoo.org/924006
|
|
Respect CFLAGS and LDFLAGS.
|
|
diff --git a/Makefile b/Makefile
|
|
index a4e5d13..2eb98c4 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -30,17 +30,17 @@ ifneq ($(OS),Windows_NT)
|
|
HEADERS += $(SRC_DIR)freq/freq.h
|
|
CFLAGS += -pthread
|
|
endif
|
|
- CFLAGS += -DARCH_X86 -std=c99 -fstack-protector-all
|
|
+ CFLAGS += -DARCH_X86 -std=c99
|
|
else ifeq ($(arch), $(filter $(arch), ppc64le ppc64 ppcle ppc))
|
|
SRC_DIR=src/ppc/
|
|
SOURCE += $(COMMON_SRC) $(SRC_DIR)ppc.c $(SRC_DIR)uarch.c $(SRC_DIR)udev.c
|
|
HEADERS += $(COMMON_HDR) $(SRC_DIR)ppc.h $(SRC_DIR)uarch.h $(SRC_DIR)udev.c
|
|
- CFLAGS += -DARCH_PPC -std=gnu99 -fstack-protector-all -Wno-language-extension-token
|
|
+ CFLAGS += -DARCH_PPC -std=gnu99 -Wno-language-extension-token
|
|
else ifeq ($(arch), $(filter $(arch), arm aarch64_be aarch64 arm64 armv8b armv8l armv7l armv6l))
|
|
SRC_DIR=src/arm/
|
|
SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_COMMON)pci.c $(SRC_DIR)udev.c sve.o
|
|
HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_COMMON)pci.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
|
|
- CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99 -fstack-protector-all
|
|
+ CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99
|
|
|
|
# Check if the compiler supports -march=armv8-a+sve. We will use it (if supported) to compile SVE detection code later
|
|
is_sve_flag_supported := $(shell $(CC) -march=armv8-a+sve -c $(SRC_DIR)sve.c -o sve_test.o 2> /dev/null && echo 'yes'; rm -f sve_test.o)
|
|
@@ -56,7 +56,7 @@ ifneq ($(OS),Windows_NT)
|
|
SRC_DIR=src/riscv/
|
|
SOURCE += $(COMMON_SRC) $(SRC_DIR)riscv.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
|
|
HEADERS += $(COMMON_HDR) $(SRC_DIR)riscv.h $(SRC_DIR)uarch.h $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_DIR)udev.h $(SRC_DIR)socs.h
|
|
- CFLAGS += -DARCH_RISCV -Wno-unused-parameter -std=c99 -fstack-protector-all
|
|
+ CFLAGS += -DARCH_RISCV -Wno-unused-parameter -std=c99
|
|
else
|
|
# Error lines should not be tabulated because Makefile complains about it
|
|
$(warning Unsupported arch detected: $(arch). See https://github.com/Dr-Noob/cpufetch#1-support)
|
|
@@ -76,7 +76,6 @@ else
|
|
OUTPUT=cpufetch.exe
|
|
endif
|
|
|
|
-all: CFLAGS += -O2
|
|
all: $(OUTPUT)
|
|
|
|
debug: CFLAGS += -g -O0
|
|
@@ -89,22 +88,22 @@ strict: CFLAGS += -O2 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
|
|
strict: $(OUTPUT)
|
|
|
|
freq_nov.o: Makefile $(SRC_DIR)freq/freq_nov.c $(SRC_DIR)freq/freq_nov.h $(SRC_DIR)freq/freq.h
|
|
- $(CC) $(CFLAGS) $(SANITY_FLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@
|
|
+ $(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@
|
|
|
|
freq_avx.o: Makefile $(SRC_DIR)freq/freq_avx.c $(SRC_DIR)freq/freq_avx.h $(SRC_DIR)freq/freq.h
|
|
- $(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx -pthread $(SRC_DIR)freq/freq_avx.c -o $@
|
|
+ $(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -c -mavx -pthread $(SRC_DIR)freq/freq_avx.c -o $@
|
|
|
|
freq_avx512.o: Makefile $(SRC_DIR)freq/freq_avx512.c $(SRC_DIR)freq/freq_avx512.h $(SRC_DIR)freq/freq.h
|
|
- $(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx512f -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
|
|
+ $(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -c -mavx512f -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
|
|
|
|
sve.o: Makefile $(SRC_DIR)sve.c $(SRC_DIR)sve.h
|
|
- $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SVE_FLAGS) -c $(SRC_DIR)sve.c -o $@
|
|
+ $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SVE_FLAGS) $(LDFLAGS) -c $(SRC_DIR)sve.c -o $@
|
|
|
|
$(OUTPUT): Makefile $(SOURCE) $(HEADERS)
|
|
ifeq ($(GIT_VERSION),"")
|
|
- $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
|
|
+ $(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) $(SOURCE) -o $(OUTPUT)
|
|
else
|
|
- $(CC) $(CFLAGS) $(SANITY_FLAGS) -DGIT_FULL_VERSION=\"$(GIT_VERSION)\" $(SOURCE) -o $(OUTPUT)
|
|
+ $(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -DGIT_FULL_VERSION=\"$(GIT_VERSION)\" $(SOURCE) -o $(OUTPUT)
|
|
endif
|
|
|
|
run: $(OUTPUT)
|