Module Name: src
Committed By: christos
Date: Thu Jul 4 01:06:07 UTC 2024
Modified Files:
src/external/gpl3/binutils/dist/ld: Makefile.am Makefile.in
Log Message:
avoid using pattern rules that our make does not support.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/binutils/dist/ld/Makefile.am
cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/binutils/dist/ld/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/ld/Makefile.am
diff -u src/external/gpl3/binutils/dist/ld/Makefile.am:1.19 src/external/gpl3/binutils/dist/ld/Makefile.am:1.20
--- src/external/gpl3/binutils/dist/ld/Makefile.am:1.19 Sun Jun 30 12:10:19 2024
+++ src/external/gpl3/binutils/dist/ld/Makefile.am Wed Jul 3 21:06:07 2024
@@ -643,10 +643,22 @@ GEN_DEPENDS = $(srcdir)/genscripts.sh ld
@TDIRS@
-e%.c:
- $(AM_V_GEN)${GENSCRIPTS} $* "$(tdir_$*)"
+# We can't use pattern rules as we don't want to depend on GNU
+# make, or else these rules could have been expressed in one
+# two-liner: 'e%.c:' and ' ${GENSCRIPTS} $* "$(tdir_$*)"'.
+# (The recursive variable expansion is portable.)
+
+run-genscripts:
+ $(AM_V_at)${GENSCRIPTS} $(script_target) "$($(script_tdirname))"
+
+.PHONY: run-genscripts
+
+#e%.c:
+# $(AM_V_GEN)${GENSCRIPTS} $* "$(tdir_$*)"
$(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
+ $(AM_V_GEN)base=`echo $@ | sed -e 's,e\(.*\).c,\1,'`; \
+ $(MAKE) run-genscripts "script_target=$$base" "script_tdirname=tdir_$$base"
#Dummy rule to prevent make considering e%.c as a source for missing
#.Pc files (and they are all missing until the e*.c files are generated).
Index: src/external/gpl3/binutils/dist/ld/Makefile.in
diff -u src/external/gpl3/binutils/dist/ld/Makefile.in:1.20 src/external/gpl3/binutils/dist/ld/Makefile.in:1.21
--- src/external/gpl3/binutils/dist/ld/Makefile.in:1.20 Sun Jun 30 12:10:19 2024
+++ src/external/gpl3/binutils/dist/ld/Makefile.in Wed Jul 3 21:06:07 2024
@@ -2389,10 +2389,22 @@ ldscripts/stamp:
@TDIRS@
-e%.c:
- $(AM_V_GEN)${GENSCRIPTS} $* "$(tdir_$*)"
+
+# We can't use pattern rules as we don't want to depend on GNU
+# make, or else these rules could have been expressed in one
+# two-liner: 'e%.c:' and ' ${GENSCRIPTS} $* "$(tdir_$*)"'.
+# (The recursive variable expansion is portable.)
+run-genscripts:
+ $(AM_V_at)${GENSCRIPTS} $(script_target) "$($(script_tdirname))"
+
+.PHONY: run-genscripts
+
+#e%.c:
+# $(AM_V_GEN)${GENSCRIPTS} $* "$(tdir_$*)"
$(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS)
+ $(AM_V_GEN)base=`echo $@ | sed -e 's,e\(.*\).c,\1,'`; \
+ $(MAKE) run-genscripts "script_target=$$base" "script_tdirname=tdir_$$base"
#Dummy rule to prevent make considering e%.c as a source for missing
#.Pc files (and they are all missing until the e*.c files are generated).
