mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-12 12:26:29 +00:00
Code Issues Projects Releases Wiki Activity

Use nested submodules to include boehm_gc/libatomic_ops

Browse Source 
Feedback of the upgrade of Boehm GC indicated that including the
libatomic_ops submodule in the top-level was inconvenient, and I agree.
This change, along with a corresponding change to the boehm_gc repository,
will instead included it as a nested submodule of boehm_gc.

.gitmodules:
libatomic_ops:
    Remove libatomic_ops submodule.

boehm_gc
    Update to the most recent revision that adds a libatomic_ops submodule.

prepare.sh:
    Update submodules recursively.

Mmakefile:
scripts/prepare_install_dir.in:
tools/bootcheck:
    Remove code in build tools that links or copies the libatomic_ops
    directory from Mercury's top-level,
This commit is contained in:
Paul Bone
2015-10-16 16:53:32 +11:00
parent 358a7226c9
commit bca1db24d1
7 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/prepare_install_dir.in
View File

@@ -57,20 +57,9 @@ cp boehm_gc/*.[chsS] ${installdir}/boehm_gc/
cp boehm_gc/tools/*.[ch] ${installdir}/boehm_gc/tools
cp boehm_gc/tools/*.sh ${installdir}/boehm_gc/tools
cp boehm_gc/build_atomic_ops.sh* ${installdir}/boehm_gc
if [ -d libatomic_ops ]; then
# If the libatomic_ops directory is present then boehm_gc/libatomic_ops
# is a symlink. This doesn't work on platforms without symlinks, but
# does anyone run this script on Windows?
cp -Rp libatomic_ops ${installdir}
ln -s ${installdir}/libatomic_ops ${installdir}/boehm_gc
rm -fr ${installdir}/libatomic_ops/src/*.o
rm -fr ${installdir}/libatomic_ops/src/*.a
else
# Otherwise boehmgc_libatomic_ops is a directory.
cp -Rp boehm_gc/libatomic_ops ${installdir}/boehm_gc
rm -fr ${installdir}/boehm_gc/libatomic_ops/src/*.o
rm -fr ${installdir}/boehm_gc/libatomic_ops/src/*.a
fi
cp -Rp boehm_gc/libatomic_ops ${installdir}/boehm_gc
rm -fr ${installdir}/boehm_gc/libatomic_ops/src/*.o
rm -fr ${installdir}/boehm_gc/libatomic_ops/src/*.a
cp -Rp boehm_gc/extra ${installdir}/boehm_gc
mkdir ${installdir}/runtime
mkdir ${installdir}/runtime/machdeps