mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-15 17:33:38 +00:00
Remove the architecture string from the installed directory structure
Estimated hours taken: 1 Branches: main and 0.12 Remove the architecture string from the installed directory structure and put the executables in $PREFIX/bin, instead of $PREFIX/lib/mercury/bin/$FULLARCH. The reason for this change is to reduce the need for unix shell scripts in the top-level bin directory that call the actual programs in the lib/mercury/bin/FULLARCH directory. The unix scripts can't be run on Windows without a unix emulation environment like Cygwin. Because the executables are now in the top-level bin directory, we cannot install multiple architectures under the same directory structure. However this is not a real loss, since the binaries for different architectures can just be installed to different locations, as we currently do anyway on mundula.cs.mu.oz.au. The plan is to rename mercury_compile to mmc and do away with the mmc unix script. This will allow mmc to be run on Windows without Cygwin or MSYS. This proposal replaces a previous proposal to implement a C version of the mmc script. That solution turned out to be quite complicated and unreliable. This diff will also mean mdice, mslice and mtc_union will be in the same directory as mmc, so will be in the PATH as long as mmc is in the PATH. configure.in: bindist/Mmakefile: bindist/bindist.Makefile.in: compiler/compile_target_code.m: compiler/handle_options.m: compiler/make.program_target.m: debian/rules: library/Mmakefile: scripts/Mmake.vars.in: scripts/mdprof.in: scripts/mercury.bat.in: scripts/mgnuc.in: scripts/ml.in: scripts/mmc.in: scripts/mprof.in: tools/run_all_tests_from_cron: tools/test_mercury: Remove FULLARCH from the installed directory structure. Install executables to the top-level bin directory.
This commit is contained in:
Ian MacLarty
@@ -1,5 +1,5 @@
|
||||
#---------------------------------------------------------------------------#
|
||||
# Copyright (C) 1996-2003 The University of Melbourne.
|
||||
# Copyright (C) 1996-2003, 2005 The University of Melbourne.
|
||||
# This file may only be copied under the terms of the GNU General
|
||||
# Public License - see the file COPYING in the Mercury distribution.
|
||||
#---------------------------------------------------------------------------#
|
||||
@@ -43,7 +43,7 @@ SCRIPT_FILES = $(INSTALL_SCRIPTS) ../scripts/*.in ../scripts/*.sh-subr \
|
||||
../scripts/canonical_grade \
|
||||
../scripts/gud.el
|
||||
|
||||
CGI_PROG = $(INSTALL_LIB_DIR)/mercury/bin/$(FULLARCH)/mdprof_cgi
|
||||
CGI_PROG = $(INSTALL_PREFIX)/bin/mdprof_cgi
|
||||
|
||||
VIM_FILES = ../vim/*
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#---------------------------------------------------------------------------#
|
||||
# Copyright (C) 1996-1999, 2001-2003 The University of Melbourne.
|
||||
# Copyright (C) 1996-1999, 2001-2003, 2005 The University of Melbourne.
|
||||
# This file may only be copied under the terms of the GNU General
|
||||
# Public License - see the file COPYING in the Mercury distribution.
|
||||
#---------------------------------------------------------------------------#
|
||||
@@ -180,7 +180,7 @@ ifneq ("$(strip $(GACUTIL))","")
|
||||
.PHONY: install_gac
|
||||
install_gac:
|
||||
if test -d $(INSTALL_LIBDIR)/lib/ilc/ ; then \
|
||||
cd $(INSTALL_LIBDIR)/lib/ilc/$(FULLARCH) && \
|
||||
cd $(INSTALL_LIBDIR)/lib/ilc && \
|
||||
$(GACUTIL) -i mercury.dll ; \
|
||||
fi
|
||||
else
|
||||
|
||||
@@ -1379,17 +1379,16 @@ link(ErrorStream, LinkTargetType, ModuleName, ObjectsList, Succeeded, !IO) :-
|
||||
globals__io_lookup_string_option(TraceFlagsOpt, TraceOpts, !IO)
|
||||
),
|
||||
|
||||
% Pass either `-llib' or `PREFIX/lib/GRADE/FULLARCH/liblib.a',
|
||||
% Pass either `-llib' or `PREFIX/lib/GRADE/liblib.a',
|
||||
% depending on whether we are linking with static or shared
|
||||
% Mercury libraries.
|
||||
|
||||
globals__io_lookup_accumulating_option(
|
||||
mercury_library_directories, MercuryLibDirs0, !IO),
|
||||
globals__io_lookup_string_option(fullarch, FullArch, !IO),
|
||||
globals__io_get_globals(Globals, !IO),
|
||||
grade_directory_component(Globals, GradeDir),
|
||||
MercuryLibDirs = list__map(
|
||||
(func(LibDir) = LibDir/"lib"/GradeDir/FullArch),
|
||||
(func(LibDir) = LibDir/"lib"/GradeDir),
|
||||
MercuryLibDirs0),
|
||||
globals__io_lookup_accumulating_option(link_libraries,
|
||||
LinkLibrariesList0, !IO),
|
||||
@@ -1469,7 +1468,6 @@ link(ErrorStream, LinkTargetType, ModuleName, ObjectsList, Succeeded, !IO) :-
|
||||
io::di, io::uo) is det.
|
||||
|
||||
get_mercury_std_libs(TargetType, StdLibDir, StdLibs, !IO) :-
|
||||
globals__io_lookup_string_option(fullarch, FullArch, !IO),
|
||||
globals__io_get_gc_method(GCMethod, !IO),
|
||||
globals__io_lookup_string_option(library_extension, LibExt, !IO),
|
||||
globals__io_get_globals(Globals, !IO),
|
||||
@@ -1506,12 +1504,12 @@ get_mercury_std_libs(TargetType, StdLibDir, StdLibs, !IO) :-
|
||||
GCGrade = GCGrade0
|
||||
),
|
||||
make_link_lib(TargetType, GCGrade, SharedGCLibs, !IO),
|
||||
StaticGCLibs = quote_arg(StdLibDir/"lib"/FullArch/
|
||||
StaticGCLibs = quote_arg(StdLibDir/"lib"/
|
||||
("lib" ++ GCGrade ++ LibExt))
|
||||
;
|
||||
GCMethod = mps,
|
||||
make_link_lib(TargetType, "mps", SharedGCLibs, !IO),
|
||||
StaticGCLibs = quote_arg(StdLibDir/"lib"/FullArch/
|
||||
StaticGCLibs = quote_arg(StdLibDir/"lib"/
|
||||
("libmps" ++ LibExt) )
|
||||
;
|
||||
GCMethod = accurate,
|
||||
@@ -1526,13 +1524,13 @@ get_mercury_std_libs(TargetType, StdLibDir, StdLibs, !IO) :-
|
||||
SharedTraceLibs = ""
|
||||
;
|
||||
StaticTraceLibs =
|
||||
quote_arg(StdLibDir/"lib"/GradeDir/FullArch/
|
||||
quote_arg(StdLibDir/"lib"/GradeDir/
|
||||
("libmer_trace" ++ LibExt)) ++
|
||||
" " ++
|
||||
quote_arg(StdLibDir/"lib"/GradeDir/FullArch/
|
||||
quote_arg(StdLibDir/"lib"/GradeDir/
|
||||
("libmer_browser" ++ LibExt)) ++
|
||||
" " ++
|
||||
quote_arg(StdLibDir/"lib"/GradeDir/FullArch/
|
||||
quote_arg(StdLibDir/"lib"/GradeDir/
|
||||
("libmer_mdbcomp" ++ LibExt)),
|
||||
make_link_lib(TargetType, "mer_trace", TraceLib, !IO),
|
||||
make_link_lib(TargetType, "mer_browser", BrowserLib, !IO),
|
||||
@@ -1545,9 +1543,9 @@ get_mercury_std_libs(TargetType, StdLibDir, StdLibs, !IO) :-
|
||||
( MercuryLinkage = "static" ->
|
||||
StdLibs = string__join_list(" ",
|
||||
[StaticTraceLibs,
|
||||
quote_arg(StdLibDir/"lib"/GradeDir/FullArch/
|
||||
quote_arg(StdLibDir/"lib"/GradeDir/
|
||||
("libmer_std" ++ LibExt)),
|
||||
quote_arg(StdLibDir/"lib"/GradeDir/FullArch/
|
||||
quote_arg(StdLibDir/"lib"/GradeDir/
|
||||
("libmer_rt" ++ LibExt)),
|
||||
StaticGCLibs])
|
||||
; MercuryLinkage = "shared" ->
|
||||
|
||||
@@ -1397,13 +1397,13 @@ postprocess_options_2(OptionTable0, Target, GC_Method, TagsMethod0,
|
||||
globals__lookup_accumulating_option(!.Globals,
|
||||
link_library_directories, LinkLibDirs0),
|
||||
globals__set_option(link_library_directories,
|
||||
accumulating([StdLibDir/"lib"/FullArch | LinkLibDirs0]),
|
||||
accumulating([StdLibDir/"lib" | LinkLibDirs0]),
|
||||
!Globals),
|
||||
|
||||
globals__lookup_accumulating_option(!.Globals,
|
||||
runtime_link_library_directories, Rpath0),
|
||||
globals__set_option(runtime_link_library_directories,
|
||||
accumulating([StdLibDir/"lib"/FullArch | Rpath0]), !Globals)
|
||||
accumulating([StdLibDir/"lib" | Rpath0]), !Globals)
|
||||
|
||||
;
|
||||
MaybeStdLibDir = no
|
||||
@@ -1455,7 +1455,7 @@ postprocess_options_2(OptionTable0, Target, GC_Method, TagsMethod0,
|
||||
MercuryLibDirs = [_ | _],
|
||||
ExtraLinkLibDirs = list__map(
|
||||
(func(MercuryLibDir) =
|
||||
MercuryLibDir/"lib"/GradeString/FullArch
|
||||
MercuryLibDir/"lib"/GradeString
|
||||
), MercuryLibDirs),
|
||||
|
||||
globals__lookup_accumulating_option(!.Globals,
|
||||
@@ -1470,7 +1470,7 @@ postprocess_options_2(OptionTable0, Target, GC_Method, TagsMethod0,
|
||||
|
||||
ExtraCIncludeDirs = list__map(
|
||||
(func(MercuryLibDir) =
|
||||
MercuryLibDir/"lib"/GradeString/FullArch/"inc"
|
||||
MercuryLibDir/"lib"/GradeString/"inc"
|
||||
), MercuryLibDirs),
|
||||
globals__lookup_accumulating_option(!.Globals, c_include_directory,
|
||||
CIncludeDirs),
|
||||
|
||||
@@ -749,13 +749,12 @@ install_library_grade_files(LinkSucceeded0, Grade, ModuleName, AllModules,
|
||||
linked_target_file_name(ModuleName, java_archive, JarFileName, !IO),
|
||||
|
||||
globals__io_lookup_string_option(install_prefix, Prefix, !IO),
|
||||
globals__io_lookup_string_option(fullarch, FullArch, !IO),
|
||||
|
||||
( Grade = "java" ->
|
||||
GradeLibDir = Prefix/"lib"/"mercury"/"lib"/"java",
|
||||
install_file(JarFileName, GradeLibDir, LibsSucceeded, !IO)
|
||||
;
|
||||
GradeLibDir = Prefix/"lib"/"mercury"/"lib"/Grade/FullArch,
|
||||
GradeLibDir = Prefix/"lib"/"mercury"/"lib"/Grade,
|
||||
install_file(LibFileName, GradeLibDir, LibSuccess, !IO),
|
||||
install_file(SharedLibFileName, GradeLibDir, SharedLibSuccess,
|
||||
!IO),
|
||||
@@ -781,7 +780,6 @@ install_grade_ints_and_headers(LinkSucceeded, Grade, ModuleName, Succeeded,
|
||||
(
|
||||
MaybeImports = yes(Imports),
|
||||
globals__io_lookup_string_option(install_prefix, Prefix, !IO),
|
||||
globals__io_lookup_string_option(fullarch, FullArch, !IO),
|
||||
LibDir = Prefix/"lib"/"mercury",
|
||||
|
||||
globals__io_get_target(Target, !IO),
|
||||
@@ -795,7 +793,7 @@ install_grade_ints_and_headers(LinkSucceeded, Grade, ModuleName, Succeeded,
|
||||
Imports ^ foreign_code = contains_foreign_code(_)
|
||||
)
|
||||
->
|
||||
GradeIncDir = LibDir/"lib"/Grade/FullArch/"inc",
|
||||
GradeIncDir = LibDir/"lib"/Grade/"inc",
|
||||
install_subdir_file(LinkSucceeded, GradeIncDir, ModuleName, "mih",
|
||||
HeaderSucceded1, !IO),
|
||||
|
||||
@@ -901,13 +899,12 @@ make_install_dirs(Result, LinkResult, !IO) :-
|
||||
|
||||
make_grade_install_dirs(Grade, Result, LinkResult, !IO) :-
|
||||
globals__io_lookup_string_option(install_prefix, Prefix, !IO),
|
||||
globals__io_lookup_string_option(fullarch, FullArch, !IO),
|
||||
LibDir = Prefix/"lib"/"mercury",
|
||||
|
||||
GradeIntsSubdir = LibDir/"ints"/Grade/"Mercury",
|
||||
make_directory(GradeIntsSubdir, Result1, !IO),
|
||||
|
||||
GradeIncSubdir = LibDir/"lib"/Grade/FullArch/"inc"/"Mercury",
|
||||
GradeIncSubdir = LibDir/"lib"/Grade/"inc"/"Mercury",
|
||||
make_directory(GradeIncSubdir, Result2, !IO),
|
||||
|
||||
Results0 = [Result1, Result2],
|
||||
|
||||
@@ -300,11 +300,11 @@ EOF
|
||||
then
|
||||
true
|
||||
elif
|
||||
test -f $LIBDIR/bin/$FULLARCH/mercury_compile ||
|
||||
test -f $LIBDIR/bin/$FULLARCH/mercury_compile.exe
|
||||
test -f $PREFIX/bin/mercury_compile ||
|
||||
test -f $PREFIX/bin/mercury_compile.exe
|
||||
then
|
||||
AC_MSG_WARN(
|
||||
[using $LIBDIR/bin/$FULLARCH/mercury_compile to bootstrap])
|
||||
[using $PREFIX/bin/mercury_compile to bootstrap])
|
||||
else
|
||||
AC_MSG_ERROR(
|
||||
[You need a working Mercury compiler to bootstrap with])
|
||||
|
||||
2
debian/rules
vendored
2
debian/rules
vendored
@@ -100,7 +100,7 @@ install-stamp:
|
||||
|
||||
cd build/mercury && \
|
||||
CC="$(CC)" \
|
||||
MERCURY_COMPILER="$(CURDIR)/debian/tmp/usr/lib/mercury/bin/`grep ^FULLARCH tmp_dir/scripts/Mmake.vars | sed -e 's/.*= //'`/mercury_compile" \
|
||||
MERCURY_COMPILER="$(CURDIR)/debian/tmp/usr/bin/mercury_compile" \
|
||||
$(MAKE) install INSTALL_PREFIX=$(CURDIR)/debian/tmp/usr $(MAKEFLAGS)
|
||||
|
||||
cp build/mercury/README build/mercury/README.DotNet \
|
||||
|
||||
@@ -533,7 +533,7 @@ ifneq (,$(findstring java,$(GRADE)))
|
||||
install_library: jars
|
||||
mkdir -p $(INSTALL_JAVA_LIBRARY_DIR)
|
||||
cp $(JARS) $(INSTALL_JAVA_LIBRARY_DIR)
|
||||
-cp $(NATIVE_SO) $(INSTALL_JAVA_LIBRARY_DIR)/$(FULLARCH)
|
||||
-cp $(NATIVE_SO) $(INSTALL_JAVA_LIBRARY_DIR)
|
||||
|
||||
else
|
||||
|
||||
|
||||
@@ -20,10 +20,10 @@ ifneq ($(MMAKE_USE_MMC_MAKE),yes)
|
||||
EXTRA_INT_DIRS = $(patsubst %,%/ints,$(EXTRA_LIB_DIRS))
|
||||
MERCURY_EXTRA_INT_DIRS = $(EXTRA_INT_DIRS)
|
||||
EXTRA_C_LIB_DIRS = \
|
||||
$(patsubst %,%/lib/$(GRADESTRING)/@FULLARCH@,$(EXTRA_LIB_DIRS)) \
|
||||
$(patsubst %,%/lib/@FULLARCH@,$(EXTRA_LIB_DIRS))
|
||||
$(patsubst %,%/lib/$(GRADESTRING),$(EXTRA_LIB_DIRS)) \
|
||||
$(patsubst %,%/lib,$(EXTRA_LIB_DIRS))
|
||||
EXTRA_C_INCL_DIRS = \
|
||||
$(patsubst %,%/lib/$(GRADESTRING)/@FULLARCH@/inc,$(EXTRA_LIB_DIRS)) \
|
||||
$(patsubst %,%/lib/$(GRADESTRING)/inc,$(EXTRA_LIB_DIRS)) \
|
||||
$(patsubst %,%/inc,$(EXTRA_LIB_DIRS))
|
||||
EXTRA_INIT_DIRS = $(patsubst %,%/modules,$(EXTRA_LIB_DIRS))
|
||||
MERCURY_EXTRA_INIT_DIRS = $(EXTRA_INIT_DIRS)
|
||||
@@ -247,7 +247,7 @@ MS_CL_LIBS =
|
||||
|
||||
# MERCURY_STDLIB_DIR should be set by the `mmake' script.
|
||||
MERC_C_INCL_DIR = $(MERCURY_STDLIB_DIR)/inc
|
||||
MERC_DLL_DIR = $(MERCURY_STDLIB_DIR)/lib/$(GRADESTRING)/@FULLARCH@
|
||||
MERC_DLL_DIR = $(MERCURY_STDLIB_DIR)/lib/$(GRADESTRING)
|
||||
|
||||
# MS_ILASM is the Microsoft IL assembler, which turns IL assembly code
|
||||
# into bytecode.
|
||||
@@ -740,14 +740,13 @@ INSTALL_GRADE_INT_DIR = $(INSTALL_LIBDIR)/ints/$(GRADESTRING)
|
||||
INSTALL_INC_DIR = $(INSTALL_LIBDIR)/inc
|
||||
INSTALL_MMAKE_DIR = $(INSTALL_LIBDIR)/mmake
|
||||
FULLARCH = @FULLARCH@
|
||||
INSTALL_MERC_BIN_DIR = $(INSTALL_LIBDIR)/bin/$(FULLARCH)
|
||||
INSTALL_MERC_GRADELESS_LIB_DIR = $(INSTALL_LIBDIR)/lib/$(FULLARCH)
|
||||
FINAL_INSTALL_MERC_GRADELESS_LIB_DIR = $(FINAL_INSTALL_LIBDIR)/lib/$(FULLARCH)
|
||||
INSTALL_MERC_LIB_DIR = $(INSTALL_LIBDIR)/lib/$(GRADESTRING)/$(FULLARCH)
|
||||
INSTALL_GRADE_INC_DIR = $(INSTALL_LIBDIR)/lib/$(GRADESTRING)/$(FULLARCH)/inc
|
||||
INSTALL_MERC_BIN_DIR = $(INSTALL_PREFIX)/bin
|
||||
INSTALL_MERC_GRADELESS_LIB_DIR = $(INSTALL_LIBDIR)/lib
|
||||
FINAL_INSTALL_MERC_GRADELESS_LIB_DIR = $(FINAL_INSTALL_LIBDIR)/lib
|
||||
INSTALL_MERC_LIB_DIR = $(INSTALL_LIBDIR)/lib/$(GRADESTRING)
|
||||
INSTALL_GRADE_INC_DIR = $(INSTALL_LIBDIR)/lib/$(GRADESTRING)/inc
|
||||
INSTALL_GRADE_INC_SUBDIR = $(INSTALL_GRADE_INC_DIR)/Mercury/mihs
|
||||
FINAL_INSTALL_MERC_LIB_DIR = \
|
||||
$(FINAL_INSTALL_LIBDIR)/lib/$(GRADESTRING)/$(FULLARCH)
|
||||
FINAL_INSTALL_MERC_LIB_DIR = $(FINAL_INSTALL_LIBDIR)/lib/$(GRADESTRING)
|
||||
|
||||
ENABLE_DEEP_PROFILER = @ENABLE_DEEP_PROFILER@
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
#---------------------------------------------------------------------------#
|
||||
# Copyright (C) 2001 The University of Melbourne.
|
||||
# Copyright (C) 2001, 2005 The University of Melbourne.
|
||||
# This file may only be copied under the terms of the GNU General
|
||||
# Public License - see the file COPYING in the Mercury distribution.
|
||||
#---------------------------------------------------------------------------#
|
||||
@@ -15,6 +15,6 @@
|
||||
# unprocessed, which is what we want; the web servers breaks up QUERY_STRING
|
||||
# on boundaries inappropriate for us when computing the command line arguments.
|
||||
|
||||
PATH=@prefix@/lib/mercury/bin/@FULLARCH@:$PATH
|
||||
PATH=@prefix@/bin:$PATH
|
||||
export PATH
|
||||
exec mdprof_cgi
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@echo off
|
||||
rem @configure_input@
|
||||
rem ---------------------------------------------------------------------------
|
||||
rem Copyright (C) 1994-1998, 2000-2001, 2003 The University of Melbourne.
|
||||
rem Copyright (C) 1994-1998, 2000-2001, 2003, 2005 The University of Melbourne.
|
||||
rem This file may only be copied under the terms of the GNU General
|
||||
rem Public License - see the file COPYING in the Mercury distribution.
|
||||
rem ---------------------------------------------------------------------------
|
||||
@@ -45,8 +45,8 @@ set MERCURY_CONFIG_DIR="@CONFIG_LIBDIR@"
|
||||
|
||||
:config_dir_set
|
||||
|
||||
if "%MERCURY_COMPILER%"=="" set MERCURY_COMPILER="@LIBDIR@\bin\@FULLARCH@\mercury_compile"
|
||||
if "%MERCURY_COMPILER%"=="^%MERCURY_COMPILER^%" set MERCURY_COMPILER="@LIBDIR@\bin\@FULLARCH@\mercury_compile"
|
||||
if "%MERCURY_COMPILER%"=="" set MERCURY_COMPILER="@PREFIX@\bin\mercury_compile"
|
||||
if "%MERCURY_COMPILER%"=="^%MERCURY_COMPILER^%" set MERCURY_COMPILER="@PREFIX@\bin\mercury_compile"
|
||||
|
||||
rem There is no equivalent of "$@" available on all Windows platforms.
|
||||
rem (Windows XP has `%*').
|
||||
|
||||
@@ -211,7 +211,7 @@ case "$mercury_stdlib_dir" in
|
||||
# The option setting code above guarantees that if
|
||||
# `--mercury-stdlib-dir' is set, `--mercury-config-dir'
|
||||
# is also set.
|
||||
MERC_ALL_C_INCL_DIRS="-I$mercury_config_dir/conf -I$mercury_stdlib_dir/inc -I$mercury_stdlib_dir/lib/$GRADE/$FULLARCH/inc"
|
||||
MERC_ALL_C_INCL_DIRS="-I$mercury_config_dir/conf -I$mercury_stdlib_dir/inc -I$mercury_stdlib_dir/lib/$GRADE/inc"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -218,7 +218,7 @@ case "$gc_grade" in
|
||||
*)
|
||||
LIBGC="-l$gc_grade"
|
||||
LIBGC_STATIC=`$FIX_PATH_FOR_LINKER \
|
||||
$LIBDIR/$FULLARCH/lib$gc_grade.@LIB_SUFFIX@`
|
||||
$LIBDIR/lib$gc_grade.@LIB_SUFFIX@`
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -235,11 +235,11 @@ case $trace in
|
||||
TRACE_LIBS_SYSTEM="$TRACE_LIBS_SYSTEM $READLINE_LIBRARIES"
|
||||
TRACE_STATIC_LIBS="\
|
||||
`$FIX_PATH_FOR_LINKER \
|
||||
$LIBDIR/$GRADE/$FULLARCH/lib$TRACE_LIB_NAME.@LIB_SUFFIX@` \
|
||||
$LIBDIR/$GRADE/lib$TRACE_LIB_NAME.@LIB_SUFFIX@` \
|
||||
`$FIX_PATH_FOR_LINKER \
|
||||
$LIBDIR/$GRADE/$FULLARCH/lib$BROWSER_LIB_NAME.@LIB_SUFFIX@` \
|
||||
$LIBDIR/$GRADE/lib$BROWSER_LIB_NAME.@LIB_SUFFIX@` \
|
||||
`$FIX_PATH_FOR_LINKER \
|
||||
$LIBDIR/$GRADE/$FULLARCH/lib$MDBCOMP_LIB_NAME.@LIB_SUFFIX@`"
|
||||
$LIBDIR/$GRADE/lib$MDBCOMP_LIB_NAME.@LIB_SUFFIX@`"
|
||||
;;
|
||||
false) TRACE_LIBS=
|
||||
TRACE_LIBS_SYSTEM=
|
||||
@@ -334,8 +334,8 @@ else
|
||||
fi
|
||||
|
||||
merc_libdir_opts="\
|
||||
@LIB_LIBPATH@$LIBDIR/$GRADE/$FULLARCH
|
||||
@LIB_LIBPATH@$LIBDIR/$FULLARCH
|
||||
@LIB_LIBPATH@$LIBDIR/$GRADE
|
||||
@LIB_LIBPATH@$LIBDIR
|
||||
"
|
||||
system_libdir_opts=
|
||||
for dir in $ALL_LOCAL_C_LIB_DIRS kludge_for_broken_shells; do
|
||||
@@ -349,15 +349,15 @@ case $mercury_libs in
|
||||
shared)
|
||||
MERCURY_LIBS=${MERCURY_LIBS="$TRACE_LIBS -l$STD_LIB_NAME -l$RT_LIB_NAME $LIBGC"}
|
||||
LIBS=${LIBS="$MERCURY_LIBS $TRACE_LIBS_SYSTEM $STDLIBS"}
|
||||
merc_shlib_dirs="$merc_shlib_dirs $LIBDIR/$GRADE/$FULLARCH"
|
||||
merc_shlib_dirs="$merc_shlib_dirs $LIBDIR/$FULLARCH"
|
||||
merc_shlib_dirs="$merc_shlib_dirs $LIBDIR/$GRADE"
|
||||
merc_shlib_dirs="$merc_shlib_dirs $LIBDIR"
|
||||
;;
|
||||
static)
|
||||
MERCURY_LIBS=${MERCURY_LIBS="$TRACE_STATIC_LIBS
|
||||
`$FIX_PATH_FOR_LINKER \
|
||||
$LIBDIR/$GRADE/$FULLARCH/lib$STD_LIB_NAME.@LIB_SUFFIX@` \
|
||||
$LIBDIR/$GRADE/lib$STD_LIB_NAME.@LIB_SUFFIX@` \
|
||||
`$FIX_PATH_FOR_LINKER \
|
||||
$LIBDIR/$GRADE/$FULLARCH/lib$RT_LIB_NAME.@LIB_SUFFIX@` \
|
||||
$LIBDIR/$GRADE/lib$RT_LIB_NAME.@LIB_SUFFIX@` \
|
||||
$LIBGC_STATIC"}
|
||||
LIBS=${LIBS="$MERCURY_LIBS $TRACE_LIBS_SYSTEM $STDLIBS"}
|
||||
merc_shlib_dirs=""
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# MERCURY_COMPILER, MERCURY_C_COMPILER, MERCURY_DEFAULT_GRADE,
|
||||
# MERCURY_DEFAULT_OPT_LEVEL.
|
||||
|
||||
MERCURY_COMPILER=${MERCURY_COMPILER-'@LIBDIR@/bin/@FULLARCH@/mercury_compile'}
|
||||
MERCURY_COMPILER=${MERCURY_COMPILER-'@PREFIX@/bin/mercury_compile'}
|
||||
MERCURY_CONFIG_DIR=${MERCURY_CONFIG_DIR-${MERCURY_STDLIB_DIR-'@CONFIG_LIBDIR@'}}
|
||||
export MERCURY_COMPILER MERCURY_CONFIG_DIR
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
# @configure_input@
|
||||
#---------------------------------------------------------------------------#
|
||||
# Copyright (C) 1995 The University of Melbourne.
|
||||
# Copyright (C) 1995, 2005 The University of Melbourne.
|
||||
# This file may only be copied under the terms of the GNU General
|
||||
# Public License - see the file COPYING in the Mercury distribution.
|
||||
#---------------------------------------------------------------------------#
|
||||
@@ -12,7 +12,7 @@
|
||||
#
|
||||
# Environment variables: MERCURY_PROFILER.
|
||||
|
||||
MPROF=${MERCURY_PROFILER="@LIBDIR@/bin/@FULLARCH@/mercury_profile"}
|
||||
MPROF=${MERCURY_PROFILER="@PREFIX@/bin/mercury_profile"}
|
||||
|
||||
case $# in
|
||||
0) exec $MPROF ;;
|
||||
|
||||
@@ -161,7 +161,7 @@ then
|
||||
echo
|
||||
INSTALL_DIR=`tail $logfile | \
|
||||
awk '/^Installation directory:/ { print $3; }' `
|
||||
cd $INSTALL_DIR/lib/mercury/bin/$FULLARCH
|
||||
cd $INSTALL_DIR/bin
|
||||
ls -l mercury_compile
|
||||
size mercury_compile
|
||||
{
|
||||
|
||||
@@ -305,16 +305,16 @@ esac
|
||||
# Version of the mercury compiler to use for bootstrapping
|
||||
# Normally we use the compiler from same location that we will install in.
|
||||
# But occasionally this setting will get overridden below.
|
||||
if test -x $INSTALL_DIR/lib/mercury/bin/$FULLARCH/mercury_compile
|
||||
if test -x $INSTALL_DIR/bin/mercury_compile
|
||||
then
|
||||
BOOTSTRAP_MERCURY_COMPILER=$INSTALL_DIR/lib/mercury/bin/$FULLARCH/mercury_compile
|
||||
BOOTSTRAP_MERCURY_COMPILER=$INSTALL_DIR/bin/mercury_compile
|
||||
fi
|
||||
|
||||
# The following can be edited and uncommented if you need to use
|
||||
# a different bootstrap compiler to re-bootstrap a host which
|
||||
# has gotten too out-of-date.
|
||||
#case $HOST in mars)
|
||||
# BOOTSTRAP_MERCURY_COMPILER=$TOPDIR/$INSTALL_DIR_NAME/$FULLARCH/lib/mercury/bin/$FULLARCH/mercury_compile
|
||||
# BOOTSTRAP_MERCURY_COMPILER=$TOPDIR/$INSTALL_DIR_NAME/$FULLARCH/bin/mercury_compile
|
||||
# ;;
|
||||
#esac
|
||||
|
||||
|
||||
Reference in New Issue
Block a user