8f920d2f94
In order to solve the problem of the possibility that the "stack" binary is incorrectly included as a header while the compiler looks for the standard C++ header "stack", a workaround forcing a dependency between building "stack" and the C++ program was introduced. This upstream fix uses the compiler "-iquote" option in order to avoid looking for standard headers in the current working directory and blocks the default inclusion of "-I ." to the compiler flags. The upstream fix happens to be incomplete, so add an extra patch to fix an additional instance and then remove the workaround. Also, adjust the way DEFAULT_INCLUDES is overridden in the build Makefile by using the "-iquote" option in the same manner in order to remove all instances of the default inclusion for the current directory. Tested-by: Georgi Valkov <gvalkov@gmail.com> # macOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/16522 Signed-off-by: Robert Marko <robimarko@gmail.com>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From b426c4db31e7c80d4262abdd845d2ece0c9a841c Mon Sep 17 00:00:00 2001
|
|
From: Alfred Wingate <parona@protonmail.com>
|
|
Date: Wed, 14 Aug 2024 12:14:38 -0400
|
|
Subject: [PATCH] Avoid overriding libcxx system header
|
|
|
|
Replace -I with -iquote to avoid overriding stack system header from libcxx-18
|
|
with the previously built stack binary. Override DEFAULT_INLCUDES because m4
|
|
adds -I. by default.
|
|
|
|
Signed-off-by: Aaron Merey <amerey@redhat.com>
|
|
---
|
|
config/eu.am | 2 +-
|
|
src/Makefile.am | 2 ++
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
--- a/config/eu.am
|
|
+++ b/config/eu.am
|
|
@@ -31,7 +31,7 @@
|
|
##
|
|
|
|
DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'
|
|
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..
|
|
+AM_CPPFLAGS = -iquote . -I$(srcdir) -I$(top_srcdir)/lib -I..
|
|
|
|
# Drop the 'u' flag that automake adds by default. It is incompatible
|
|
# with deterministic archives.
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -19,6 +19,8 @@
|
|
include $(top_srcdir)/config/eu.am
|
|
DEFS += $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \
|
|
-DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"
|
|
+
|
|
+DEFAULT_INCLUDES =
|
|
AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \
|
|
-I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \
|
|
-I$(srcdir)/../libdwfl -I$(srcdir)/../libasm -I../debuginfod
|