From f3dc269df64d11763e76370c5b413dc15c11235b Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 19 Dec 2020 14:21:15 -0800 Subject: [PATCH] macos-setup: work around a botch in GLib "make distclean". [skip ci] --- tools/macos-setup.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh index 7733d9a06b..a53b4b725e 100755 --- a/tools/macos-setup.sh +++ b/tools/macos-setup.sh @@ -815,7 +815,14 @@ uninstall_glib() { echo "Uninstalling GLib:" cd glib-$installed_glib_version $DO_MAKE_UNINSTALL || exit 1 - make distclean || exit 1 + # + # This appears to delete dependencies out from under other + # Makefiles in the tree, causing it to fail. At least until + # that gets fixed, if it ever gets fixed, we just ignore the + # exit status of "make distclean" + # + # make distclean || exit 1 + make distclean || echo "Ignoring make distclean failure" 1>&2 cd .. rm glib-$installed_glib_version-done