summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2017-07-17 12:54:42 +0200
committerPatrick Georgi <pgeorgi@google.com>2017-07-18 13:36:01 +0000
commit9f4864f499864345e5b3296251b0e1d636a04572 (patch)
tree800503d8ab8c9e98e6ca2d0a01bf8aefb9afac7b
parent8a303b7865203bd208c9424f0c641e1c94a8e6fa (diff)
downloadcoreboot-9f4864f499864345e5b3296251b0e1d636a04572.tar.xz
crossgcc: patch out uses of $(P) variable from gcc/ada build
Gentoo likes to use that variable for itself and insists on keeping it. Meanwhile it doesn't seem to be set or used anywhere else in the gcc build, and it seems there was a big $(P)-pruning going on in 2000, so why is it even (still) there? Related upstream change can be found at https://gcc.gnu.org/ml/gcc-patches/2017-07/msg01015.html Change-Id: I2c2bdf9cb215c489f760f43642a86592924e4e65 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/20612 Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--util/crossgcc/patches/gcc-6.3.0_no-p-var.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/util/crossgcc/patches/gcc-6.3.0_no-p-var.patch b/util/crossgcc/patches/gcc-6.3.0_no-p-var.patch
new file mode 100644
index 0000000000..0600a66cd1
--- /dev/null
+++ b/util/crossgcc/patches/gcc-6.3.0_no-p-var.patch
@@ -0,0 +1,15 @@
+--- gcc-6.3.0/gcc/ada/gcc-interface/Makefile.in.orig 2017-07-17 12:52:05.541815635 +0200
++++ gcc-6.3.0/gcc/ada/gcc-interface/Makefile.in 2017-07-17 12:52:18.693764268 +0200
+@@ -2637,10 +2637,10 @@
+ # stamp target in the parent directory whenever gnat1 is rebuilt
+
+ # Likewise for the tools
+-../../gnatmake$(exeext): $(P) b_gnatm.o $(GNATMAKE_OBJS)
++../../gnatmake$(exeext): b_gnatm.o $(GNATMAKE_OBJS)
+ +$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) $(TOOLS_LIBS) $(TOOLS1_LIBS)
+
+-../../gnatlink$(exeext): $(P) b_gnatl.o $(GNATLINK_OBJS)
++../../gnatlink$(exeext): b_gnatl.o $(GNATLINK_OBJS)
+ +$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) $(TOOLS_LIBS) $(TOOLS1_LIBS)
+
+ ../stamp-gnatlib-$(RTSDIR):