sigh

Change-Id: I08c8aa733d2a96cd21a64fb22b46224465c8560e

.github/workflows/apple-gdb-1824-macos.yml

@@ -24,7 +24,7 @@ jobs:
     - run: if test ! -e libcheckpoint/libcheckpoint.dylib; then make -ki -C libcheckpoint -f Makefile_orig RC_CFLAGS="-std=gnu89 -w -Wno-error" || make -ki -C macsbug || make -ki -C macsbug/gdb_plugin_support || (if test -x "$(which ant)"; then ant; else echo "ant missing"; fi); else stat libcheckpoint/libcheckpoint.dylib; fi
     - run: if test ! -e macsbug/MacsBug_plugin; then make -ki -C macsbug || make -ki -C macsbug/gdb_plugin_support || (if test -x "$(which ant)"; then ant; else echo "ant missing"; fi); else stat macsbug/MacsBug_plugin; fi
     - run: if test ! -e macsbug/gdb_plugin_support/gdb_plugin_support.o; then make -ki -C macsbug/gdb_plugin_support || (if test -x "$(which ant)"; then ant; fi) || (for cfile in macsbug/gdb_plugin_support/*.c; do ${{ matrix.compiler }} -c "${cfile}" || stat "${cfile}"; done); else stat macsbug/gdb_plugin_support/gdb_plugin_support.o; fi
-    - run: if test -d .. && test -w .. && test ! -e ../gdb; then cd .. && ln -sv apple-gdb-1824 gdb; else stat .. && ls ..; fi
+    - run: if test -d .. && test -w .. && test ! -e ../gdb; then (pushd .. && ln -sv apple-gdb-1824 gdb && readlink gdb && popd); else stat .. && ls ..; fi
     - run: (if test -x "$(which ant)"; then if test ! -d build; then mkdir build; elif test ! -d "${HOME}"/work/apple-gdb-1824/build; then mkdir -pv "${HOME}"/work/apple-gdb-1824/build; fi; ant; else echo "ant missing"; fi) || (if test -x ./gradlew; then (./gradlew build || ./gradlew assemble || ./gradlew); elif test -r ./gradlew; then sh ./gradlew; elif test -e ./gradlew; then stat ./gradlew; else echo "gradlewrapper missing"; fi) || (if test -x "$(which gradle)"; then gradle; else echo "gradle missing"; fi) || (if test -x ~rc/bin/buildit; then sudo ~rc/bin/buildit "$(pwd)" -arch ppc -arch i386 -arch armv5 -target cross -project gdb -release RELEASENAME RC_CROSS_ARCHS=armv6; else echo "buildit missing"; fi) || ls
     - run: (if test -x ./gradlew; then (./gradlew build || ./gradlew assemble || ./gradlew); elif test -r ./gradlew; then sh ./gradlew; elif test -e ./gradlew; then stat ./gradlew; else echo "gradlewrapper missing" >&2; fi) || (if test -x "$(which gradle)"; then gradle; else echo "gradle missing"; fi) || (if test -x ~rc/bin/buildit; then sudo ~rc/bin/buildit "$(pwd)" -arch ppc -arch i386 -arch armv5 -target cross -project gdb -release RELEASENAME RC_CROSS_ARCHS=armv6; else echo "buildit missing"; fi) || ls
     - run: cd src && ./configure --disable-werror --disable-opts-test --enable-carbon-framework --enable-debug-symbols-framework --enable-64-bit-bfd --enable-silent-rules

.github/workflows/apple-gdb-1824.yml

@@ -33,7 +33,7 @@ jobs:
     - run: cd src && for dir in sim utils tcl expect dejagnu itcl tk libgui; do if test -e ${dir}/Makefile; then make -C ${dir}; elif test -d ${dir}; then ls ${dir}/Makefile*; else echo "skipping ${dir}"; fi; done
     - run: cd src && make check-libiberty
     - run: cd src && make -C tcl/unix tcltest
-    - run: cd src && for dir in sim itcl libgui; do if test -e ${dir}/Makefile; then make check-${dir} V=0 RUNTESTFLAGS="-v"; elif test -d ${dir}; then ls ${dir}/Makefile*; else echo "skipping testing ${dir}"; fi; done
+    - run: cd src && for dir in sim itcl; do if test -e ${dir}/Makefile; then make check-${dir} V=0 RUNTESTFLAGS="-v"; elif test -d ${dir}; then ls ${dir}/Makefile*; else echo "skipping testing ${dir}"; fi; done
     - run: pwd
       if: "${{ success() }}"
     - run: find . -name config.log -print0 | xargs cat | grep -i error | sort | uniq

libcheckpoint/Makefile_orig

@@ -47,3 +47,4 @@ $(SYMROOT)/$(LIB) : $(OBJS)
 		-install_name $(GDBDIR)/$(LIB) \
 		-single_module -compatibility_version 1 \
 		-current_version 1 $(OBJS) -framework ApplicationServices
+	stat $(SYMROOT)/$(LIB) || stat $(GDBDIR)/$(LIB) || stat $(OBJS)

src/intl/configure

@@ -3353,7 +3353,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 
-echo "hello from the intl subdirectory's configure script"
+echo "hello from the intl subdirectory's configure script (in `pwd`)"
 
 # architectures:
 

src/intl/configure.ac

@@ -14,7 +14,7 @@ m4_ifdef([AC_REQUIRE_AUX_FILE],[
   AC_REQUIRE_AUX_FILE([ylwrap])dnl
 ])dnl
 
-echo "hello from the intl subdirectory's configure script"
+echo "hello from the intl subdirectory's configure script (in `pwd`)"
 
 # architectures:
 AC_CANONICAL_TARGET

src/libiberty/configure

@@ -3570,7 +3570,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-echo "hello from libiberty's configure script"
+echo "hello from libiberty's configure script (in `pwd`)"
 
 # This works around the fact that libtool configuration may change LD
 # for this particular configuration, but some shells, instead of
@@ -6858,11 +6858,15 @@ fi
     test -z "${with_multisrctop}" || echo "inconsistent test for with_multisrctop"
     if test -d .. && test -e ../config-ml.in; then
       export with_multisrctop="../"
+    elif test -d ../.. && test -r ../../config-ml.in; then
+      export with_multisrctop="../../"
+    elif test -d ../src && test -r ../src/config-ml.in; then
+      export with_multisrctop="../src/"
     elif test -d ../../src && test -r ../../src/config-ml.in; then
       export with_multisrctop="../../src/"
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: we need config-ml.in, but it seems to be missing all the directories we checked" >&5
-printf "%s\n" "$as_me: WARNING: we need config-ml.in, but it seems to be missing all the directories we checked" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: we need config-ml.in, but it seems to be missing in all the directories we checked" >&5
+printf "%s\n" "$as_me: WARNING: we need config-ml.in, but it seems to be missing in all the directories we checked" >&2;}
     fi
   else
     test -n "${with_multisrctop}" && echo "with_multisrctop is ${with_multisrctop}"

src/libiberty/configure.ac

@@ -7,7 +7,7 @@ dnl# bug report address is email address of last person to touch this
 dnl# directory, according to the Changelog-Apple in this directory
 AC_CONFIG_SRCDIR([xmalloc.c])dnl
 
-echo "hello from libiberty's configure script"
+echo "hello from libiberty's configure script (in `pwd`)"
 
 # This works around the fact that libtool configuration may change LD
 # for this particular configuration, but some shells, instead of
@@ -287,10 +287,14 @@ m4_ifdef([AM_ENABLE_MULTILIB],[
     test -z "${with_multisrctop}" || echo "inconsistent test for with_multisrctop"
     if test -d .. && test -e ../config-ml.in; then
       export with_multisrctop="../"
+    elif test -d ../.. && test -r ../../config-ml.in; then
+      export with_multisrctop="../../"
+    elif test -d ../src && test -r ../src/config-ml.in; then
+      export with_multisrctop="../src/"
     elif test -d ../../src && test -r ../../src/config-ml.in; then
       export with_multisrctop="../../src/"
     else
-      AC_MSG_WARN([we need config-ml.in, but it seems to be missing all the directories we checked])
+      AC_MSG_WARN([we need config-ml.in, but it seems to be missing in all the directories we checked])
     fi
   else
     test -n "${with_multisrctop}" && echo "with_multisrctop is ${with_multisrctop}"