mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-15 01:13:30 +00:00
bc92fb14b1
reviews.
The configure script now supports the --without-hwloc option to disable the use
of hwloc, even if it is installed.
configure.in:
Allow the use of libhwloc to be disabled with the --without-hwloc option.
Distribute the autoconf macros for pkg-config with Mercury.
This allows mercury to be compiled from CVS on hosts that don't have these
macros in their autoconf installation.
acinclude.m4:
m4/mercury.m4:
Moved acinclude.m4 to m4/mercury.m4. This file contains mercury-specific
macros.
m4/pkg.m4:
Copied pkg.m4 from the autoconf installation on taura. This file contains
pkg-config macros.
INSTALL_CVS:
Mmakefile:
tools/test_mercury:
When calling aclocal pass the -I m4 option.
tools/bootcheck:
Create a link to the m4 directory when setting up stage directories.
Fix static linking with mmc --make and hwloc.
compiler/compile_target_code.m:
Conform to changes in scripts/ml.in (where static linking and hwloc is
already handled correctly).
compiler/options.m:
Create new options so that Mercury.config can tell mmc what options are
needed for linking to hwloc.
scripts/Mercury.config:
Pass hwloc linking options to the compiler.
54 lines
1.6 KiB
Bash
Executable File
54 lines
1.6 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# INSTALL_CVS - installation instructions and installation script.
|
|
# This version is for use by Mercury developers after you have
|
|
# just checked the files out from the CVS archive.
|
|
# Note: you need a previous version of Mercury already installed
|
|
# (the CVS archive doesn't have all the necessary files for
|
|
# bootstrapping).
|
|
# You also need autoconf (version 2.58 or later) (and hence GNU m4)
|
|
# installed.
|
|
#
|
|
# Step 0. aclocal && autoconf
|
|
#
|
|
# Step 1. ./configure
|
|
#
|
|
# Step 2. mmake depend
|
|
#
|
|
# Step 3. mmake
|
|
#
|
|
# Step 4. tools/bootcheck
|
|
#
|
|
# Step 5. cd stage2 && mmake install
|
|
#
|
|
# If you just want to do a `make' rather than a `make install',
|
|
# then comment out the `mmake install' line below.
|
|
#
|
|
# If you want to install without doing a boot check, then comment
|
|
# out the `tools/bootcheck' and `cd stage2' lines below. If the
|
|
# version of the compiler you checked out is buggy and you don't
|
|
# perform a boot check first, you risk installing a version of the
|
|
# compiler incapable of compiling itself. Make sure you have a
|
|
# fall-back plan if you do this.
|
|
# Note also that occasionally changes made to the compiler mean
|
|
# that installing from a stage 1 build will fail, even when the
|
|
# compiler is fine. In such cases the only way to install the
|
|
# compiler is from the stage 2 directory.
|
|
#
|
|
# If you don't want to do a parallel make, comment out the
|
|
# `parallel=-j3' line below.
|
|
|
|
parallel=-j3
|
|
|
|
aclocal -I m4 &&
|
|
autoconf &&
|
|
./configure &&
|
|
touch Mmake.params &&
|
|
touch Mercury.options &&
|
|
mmake depend $parallel &&
|
|
mmake MMAKEFLAGS=$parallel &&
|
|
tools/bootcheck $parallel &&
|
|
cd stage2 &&
|
|
mmake install MMAKEFLAGS=$parallel &&
|
|
true
|