mirror of
https://github.com/hanwckf/immortalwrt-mt798x.git
synced 2025-01-10 03:09:08 +08:00
a8bbadefaf
It seems that the Makefile has both CC and CFLAGS hardcoded and does not allow overriding them by ones being passed by the buildsystem. This works fine until CONFIG_PKG_ASLR_PIE_ALL is selected, then building will fail with: arm-openwrt-linux-muslgnueabi/bin/ld.bfd: mhz.o: relocation R_ARM_MOVW_ABS_NC against `a local symbol' can not be used when making a shared object; recompile with -fPIC arm-openwrt-linux-muslgnueabi/bin/ld.bfd: mhz.o(.text+0x75c): unresolvable R_ARM_CALL relocation against symbol `__aeabi_l2d@@GCC_3.5 So, lets add a patch pending upstream that allows both CC and CFLAGS to be overriden so that ones passed by the buildsystem are actually respected. Fixes: 89123b308f98 ("mhz: add new package") Signed-off-by: Robert Marko <robimarko@gmail.com> (cherry picked from commit 6c28f46f37d35dce06c320d9ac7f256c113aea22) Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org> (cherry picked from commit 8c90527a80b0adf34f331f2f5517dce7795e9404)
30 lines
957 B
Diff
30 lines
957 B
Diff
From d55f7b578eb2126d2e4a7f045321f6ba7df3800a Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Wed, 30 Aug 2023 20:31:07 +0200
|
|
Subject: [PATCH] Makefile: allow overriding CC and CFLAGS
|
|
|
|
For OpenWrt and Buildroot which support really large amount of different
|
|
architectures and cores it is sometimes required to pass our own CFLAGS.
|
|
This is especially true if hardening options are to be respected.
|
|
|
|
Also, for cross-compiling CC should be respected as currently it is
|
|
working since both OpenWrt and Buildroot symlink gcc to the cross compiler.
|
|
|
|
So, lets set the current values as defaults but allow them to be overriden.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
Makefile | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,5 +1,5 @@
|
|
-CC := gcc
|
|
-CFLAGS := -O3 -Wall -fomit-frame-pointer
|
|
+CC ?= gcc
|
|
+CFLAGS ?= -O3 -Wall -fomit-frame-pointer
|
|
|
|
all: mhz
|
|
|