[m-rev.] bdwgc diff: Delete references to obsolete libatomic_ops directories.
Peter Wang
novalazy at gmail.com
Tue Feb 8 12:46:49 AEDT 2022
I noticed this when trying to build Mercury on AIX again. Ultimately,
it turned out not to be the cause of a problem I hit, but might as well fix it now.
I will update the version referenced by the boehm_gc submodule to
include this.
----
Mmakefile:
Don't try to clean "libatomic_ops-1.2" and "libatomic_ops-install"
directories as they no longer exist.
.gitignore:
Don't ignore "libatomic_ops-install".
diff --git a/.gitignore b/.gitignore
index 7cd7159c..e7342c46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,7 +96,6 @@ config.h.in~
stamp-h1
# External library (without trailing slash to allow symlinks):
-/libatomic_ops-install
/pthreads-w32*
# These files are generated by autoreconf:
diff --git a/Mmakefile b/Mmakefile
index 6ef024f0..7faeac37 100644
--- a/Mmakefile
+++ b/Mmakefile
@@ -76,19 +76,12 @@ endif
clean_local:
rm -rf Release/ Debug/
rm -f *.obj gc.lib libgc.lib libpar_gc.lib libpar_gc.dll libgc_debug.lib
- cd libatomic_ops-1.2 && $(MAKE) clean
cd libatomic_ops && $(MAKE) clean
- rm -f libatomic_ops-1.2/Makefile libatomic_ops-1.2/tests/Makefile
- rm -f libatomic_ops-1.2/src/Makefile
- rm -f libatomic_ops-1.2/src/atomic_ops/Makefile
- rm -f libatomic_ops-1.2/src/config.h
- rm -f libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile
rm -f libatomic_ops/Makefile libatomic_ops/tests/Makefile
rm -f libatomic_ops/src/Makefile
rm -f libatomic_ops/src/atomic_ops/Makefile
rm -f libatomic_ops/src/config.h
rm -f libatomic_ops/src/atomic_ops/sysdeps/Makefile
- rm -rf libatomic_ops-install
else
submake: Makefile force
@@ -103,20 +96,13 @@ submake: Makefile force
clean_local:
MAKEFLAGS=""; export MAKEFLAGS; \
$(MAKE) $(BOEHMGC_MAKEFILE) $(MMAKEFLAGS) clean
- -cd libatomic_ops-1.2 && $(MAKE) $(MMAKEFLAGS) clean
-cd libatomic_ops && $(MAKE) $(MMAKEFLAGS) clean
rm -f libgc.$A libgc.so libgc.dylib libpar_gc.$A libpar_gc.dll
- rm -f libatomic_ops-1.2/Makefile libatomic_ops-1.2/tests/Makefile
- rm -f libatomic_ops-1.2/src/Makefile
- rm -f libatomic_ops-1.2/src/atomic_ops/Makefile
- rm -f libatomic_ops-1.2/src/config.h
- rm -f libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile
rm -f libatomic_ops/Makefile libatomic_ops/tests/Makefile
rm -f libatomic_ops/src/Makefile
rm -f libatomic_ops/src/atomic_ops/Makefile
rm -f libatomic_ops/src/config.h
rm -f libatomic_ops/src/atomic_ops/sysdeps/Makefile
- rm -rf libatomic_ops-install
rm -f Makefile
# Makefile.direct is the makefile supplied with the Boehm tarball. We have
--
2.31.0
More information about the reviews
mailing list