From b558e27b7172f20a5e08f017bbe6b05798aec437 Mon Sep 17 00:00:00 2001 From: Eric Gallager Date: Fri, 27 Oct 2023 08:09:25 -0400 Subject: [PATCH] that darn bfd header is really annoying Change-Id: I71e0f40c47df3b3cd493d46ddca96bc50455d8f6 --- .github/workflows/apple-gdb-1824-macos.yml | 4 ++++ src/Makefile.in | 7 +++++++ src/Makefile.tpl | 7 +++++++ src/bfd/po/bfd.pot | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/apple-gdb-1824-macos.yml b/.github/workflows/apple-gdb-1824-macos.yml index 1b159311f..1e82b0ad7 100644 --- a/.github/workflows/apple-gdb-1824-macos.yml +++ b/.github/workflows/apple-gdb-1824-macos.yml @@ -16,6 +16,10 @@ jobs: - run: ./configure --enable-silent-rules - run: make -ki -C libcheckpoint || make -ki -C libcheckpoint -f Makefile_orig || make -ki -C macsbug || make -ki -C macsbug/gdb_plugin_support || (if test -x "$(which ant)"; then ant; fi) - run: cd src && ./configure --disable-werror --disable-opts-test --enable-carbon-framework --enable-debug-symbols-framework --enable-64-bit-bfd --enable-silent-rules + - run: cd src && make configure-bfd + - run: cd src && make -C bfd headers + - run: cd src && if test ! -e bfd/bfd.h; then make -C bfd bfd.h; else stat bfd/bfd.h; fi + - run: cd src && make -C bfd diststuff - run: cd src && make - run: cd src && make check - run: pwd diff --git a/src/Makefile.in b/src/Makefile.in index e3a97a749..299398c12 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -62101,6 +62101,13 @@ configure-gdb: $(CONFIGURE_GDB_TK) all-gdb: $(gdbnlmrequirements) $(GDB_TK) install-gdb: $(INSTALL_GDB_TK) +# Special-case for this one annoying target: +bfd-headers: configure-bfd + $(MAKE) -C bfd headers + if test ! -e bfd/bfd.h; then make -C bfd bfd.h; else stat bfd/bfd.h; fi +.PHONY: bfd-headers +all-bfd: bfd-headers + # Serialization dependencies. Host configures do NOT work well in parallel # to each other, due to contention over config.cache. Target configures and # build configures are similar. diff --git a/src/Makefile.tpl b/src/Makefile.tpl index f86ca74bc..2a8c083bd 100644 --- a/src/Makefile.tpl +++ b/src/Makefile.tpl @@ -1964,6 +1964,13 @@ configure-gdb: $(CONFIGURE_GDB_TK) all-gdb: $(gdbnlmrequirements) $(GDB_TK) install-gdb: $(INSTALL_GDB_TK) +# Special-case for this one annoying target: +bfd-headers: configure-bfd + $(MAKE) -C bfd headers + if test ! -e bfd/bfd.h; then make -C bfd bfd.h; else stat bfd/bfd.h; fi +.PHONY: bfd-headers +all-bfd: bfd-headers + # Serialization dependencies. Host configures do NOT work well in parallel # to each other, due to contention over config.cache. Target configures and # build configures are similar. diff --git a/src/bfd/po/bfd.pot b/src/bfd/po/bfd.pot index 27df940ec..b362dcd36 100644 --- a/src/bfd/po/bfd.pot +++ b/src/bfd/po/bfd.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-26 23:24-0400\n" +"POT-Creation-Date: 2023-10-27 08:04-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"