mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-05-02 19:21:06 -07:00
Fix problems identified in nb's review <https://info.ravenbrook.com/mail/2014/05/12/15-10-13/0/>.
Copied from Perforce Change: 186038 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees
parent
9ad6005a18
commit
9836b47c70
8 changed files with 205 additions and 47 deletions
|
|
@ -13,7 +13,10 @@ INSTALL=@INSTALL@
|
|||
INSTALL_DATA=@INSTALL_DATA@
|
||||
INSTALL_PROGRAM=@INSTALL_PROGRAM@
|
||||
MAKE=@MAKE@
|
||||
MPS_TARGET_NAME=@MPS_TARGET_NAME@
|
||||
MPS_OS_NAME=@MPS_OS_NAME@
|
||||
MPS_ARCH_NAME=@MPS_ARCH_NAME@
|
||||
MPS_BUILD_NAME=@MPS_BUILD_NAME@
|
||||
MPS_TARGET_NAME=$(MPS_OS_NAME)$(MPS_ARCH_NAME)$(MPS_BUILD_NAME)
|
||||
EXTRA_TARGETS=@EXTRA_TARGETS@
|
||||
prefix=$(DESTDIR)@prefix@
|
||||
TARGET_OPTS=-C code -f $(MPS_TARGET_NAME).gmk EXTRA_TARGETS="$(EXTRA_TARGETS)"
|
||||
|
|
@ -68,12 +71,9 @@ make-install-dirs:
|
|||
install: @INSTALL_TARGET@
|
||||
|
||||
test-make-build:
|
||||
$(MAKE) clean
|
||||
$(MAKE) $(TARGET_OPTS) testci
|
||||
$(MAKE) clean
|
||||
$(MAKE) $(TARGET_OPTS) VARIETY=cool CFLAGS="-DCONFIG_PF_ANSI -DCONFIG_THREAD_SINGLE" testansi
|
||||
$(MAKE) clean
|
||||
$(MAKE) $(TARGET_OPTS) VARIETY=cool CFLAGS="-DCONFIG_PF_ANSI -DCONFIG_THREAD_SINGLE -DCONFIG_POLL_NONE" testpoll
|
||||
$(MAKE) -C code -f anan$(MPS_BUILD_NAME).gmk VARIETY=cool clean testansi
|
||||
$(MAKE) -C code -f anan$(MPS_BUILD_NAME).gmk VARIETY=cool CFLAGS="-DCONFIG_POLL_NONE" clean testpoll
|
||||
|
||||
test-xcode-build:
|
||||
$(XCODEBUILD) -config Release -target testci
|
||||
|
|
|
|||
66
mps/code/anangc.gmk
Normal file
66
mps/code/anangc.gmk
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
# -*- makefile -*-
|
||||
#
|
||||
# anangc.gmk: BUILD FOR ANSI/ANSI/GCC PLATFORM
|
||||
#
|
||||
# $Id$
|
||||
# Copyright (c) 2001-2014 Ravenbrook Limited. See end of file for license.
|
||||
|
||||
PFM = anangc
|
||||
|
||||
MPMPF = \
|
||||
lockan.c \
|
||||
prmcan.c \
|
||||
protan.c \
|
||||
span.c \
|
||||
ssan.c \
|
||||
than.c \
|
||||
vman.c
|
||||
|
||||
LIBS = -lm
|
||||
|
||||
include gc.gmk
|
||||
|
||||
CFLAGSCOMPILER += -DCONFIG_PF_ANSI -DCONFIG_THREAD_SINGLE
|
||||
|
||||
include comm.gmk
|
||||
|
||||
|
||||
# C. COPYRIGHT AND LICENSE
|
||||
#
|
||||
# Copyright (C) 2001-2014 Ravenbrook Limited <http://www.ravenbrook.com/>.
|
||||
# All rights reserved. This is an open source license. Contact
|
||||
# Ravenbrook for commercial licensing options.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# 3. Redistributions in any form must be accompanied by information on how
|
||||
# to obtain complete source code for this software and any accompanying
|
||||
# software that uses this software. The source code must either be
|
||||
# included in the distribution or be available for no more than the cost
|
||||
# of distribution plus a nominal fee, and must be freely redistributable
|
||||
# under reasonable conditions. For an executable file, complete source
|
||||
# code means the source code for all modules it contains. It does not
|
||||
# include source code for modules or files that typically accompany the
|
||||
# major components of the operating system on which the executable file
|
||||
# runs.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
|
||||
# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
||||
# PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
# COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
||||
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
66
mps/code/ananll.gmk
Normal file
66
mps/code/ananll.gmk
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
# -*- makefile -*-
|
||||
#
|
||||
# ananll.gmk: BUILD FOR ANSI/ANSI/Clang PLATFORM
|
||||
#
|
||||
# $Id$
|
||||
# Copyright (c) 2014 Ravenbrook Limited. See end of file for license.
|
||||
|
||||
PFM = ananll
|
||||
|
||||
MPMPF = \
|
||||
lockan.c \
|
||||
prmcan.c \
|
||||
protan.c \
|
||||
span.c \
|
||||
ssan.c \
|
||||
than.c \
|
||||
vman.c
|
||||
|
||||
LIBS = -lm
|
||||
|
||||
include ll.gmk
|
||||
|
||||
CFLAGSCOMPILER += -DCONFIG_PF_ANSI -DCONFIG_THREAD_SINGLE
|
||||
|
||||
include comm.gmk
|
||||
|
||||
|
||||
# C. COPYRIGHT AND LICENSE
|
||||
#
|
||||
# Copyright (C) 2001-2014 Ravenbrook Limited <http://www.ravenbrook.com/>.
|
||||
# All rights reserved. This is an open source license. Contact
|
||||
# Ravenbrook for commercial licensing options.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# 3. Redistributions in any form must be accompanied by information on how
|
||||
# to obtain complete source code for this software and any accompanying
|
||||
# software that uses this software. The source code must either be
|
||||
# included in the distribution or be available for no more than the cost
|
||||
# of distribution plus a nominal fee, and must be freely redistributable
|
||||
# under reasonable conditions. For an executable file, complete source
|
||||
# code means the source code for all modules it contains. It does not
|
||||
# include source code for modules or files that typically accompany the
|
||||
# major components of the operating system on which the executable file
|
||||
# runs.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
|
||||
# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
|
||||
# PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
# COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
||||
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
|
@ -41,7 +41,7 @@ CFLAGSCOMPILERLAX :=
|
|||
# If interrupted, this is liable to leave a zero-length file behind.
|
||||
|
||||
define gendep
|
||||
$(SHELL) -ec "$(CC) $(CFLAGS) -MM $< | \
|
||||
$(SHELL) -ec "$(CC) $(CFLAGSSTRICT) -MM $< | \
|
||||
sed '/:/s!$*.o!$(@D)/& $(@D)/$*.d!' > $@"
|
||||
[ -s $@ ] || rm -f $@
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ CFLAGSCOMPILERLAX :=
|
|||
# If interrupted, this is liable to leave a zero-length file behind.
|
||||
|
||||
define gendep
|
||||
$(SHELL) -ec "$(CC) $(CFLAGS) -MM $< | \
|
||||
$(SHELL) -ec "$(CC) $(CFLAGSSTRICT) -MM $< | \
|
||||
sed '/:/s!$*.o!$(@D)/& $(@D)/$*.d!' > $@"
|
||||
[ -s $@ ] || rm -f $@
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -309,16 +309,11 @@ void SegSetSummary(Seg seg, RefSet summary)
|
|||
AVERT(Seg, seg);
|
||||
AVER(summary == RefSetEMPTY || SegRankSet(seg) != RankSetEMPTY);
|
||||
|
||||
#if defined(REMEMBERED_SET)
|
||||
/* Nothing to do. */
|
||||
#elif defined(REMEMBERED_SET_NONE)
|
||||
#if defined(REMEMBERED_SET_NONE)
|
||||
/* Without protection, we can't maintain the remembered set because
|
||||
there are writes we don't know about. TODO: rethink this when
|
||||
implementating control. */
|
||||
there are writes we don't know about. */
|
||||
summary = RefSetUNIV;
|
||||
#else
|
||||
#error "No remembered set configuration."
|
||||
#endif /* REMEMBERED_SET */
|
||||
#endif
|
||||
|
||||
if (summary != SegSummary(seg))
|
||||
seg->class->setSummary(seg, summary);
|
||||
|
|
@ -332,15 +327,12 @@ void SegSetRankAndSummary(Seg seg, RankSet rankSet, RefSet summary)
|
|||
AVERT(Seg, seg);
|
||||
AVERT(RankSet, rankSet);
|
||||
|
||||
#if defined(REMEMBERED_SET)
|
||||
/* Nothing to do. */
|
||||
#elif defined(REMEMBERED_SET_NONE)
|
||||
#if defined(REMEMBERED_SET_NONE)
|
||||
if (rankSet != RankSetEMPTY) {
|
||||
summary = RefSetUNIV;
|
||||
}
|
||||
#else
|
||||
#error "No remembered set configuration."
|
||||
#endif /* REMEMBERED_SET */
|
||||
#endif
|
||||
|
||||
seg->class->setRankSummary(seg, rankSet, summary);
|
||||
}
|
||||
|
||||
|
|
|
|||
52
mps/configure
vendored
52
mps/configure
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for Memory Pool System Kit release/1.113.0.
|
||||
# Generated by GNU Autoconf 2.69 for Memory Pool System Kit release/1.114.0.
|
||||
#
|
||||
# Report bugs to <mps-questions@ravenbrook.com>.
|
||||
#
|
||||
|
|
@ -580,8 +580,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='Memory Pool System Kit'
|
||||
PACKAGE_TARNAME='mps-kit'
|
||||
PACKAGE_VERSION='release/1.113.0'
|
||||
PACKAGE_STRING='Memory Pool System Kit release/1.113.0'
|
||||
PACKAGE_VERSION='release/1.114.0'
|
||||
PACKAGE_STRING='Memory Pool System Kit release/1.114.0'
|
||||
PACKAGE_BUGREPORT='mps-questions@ravenbrook.com'
|
||||
PACKAGE_URL='http://www.ravenbrook.com/project/mps/'
|
||||
|
||||
|
|
@ -629,7 +629,9 @@ TEST_TARGET
|
|||
INSTALL_TARGET
|
||||
CLEAN_TARGET
|
||||
BUILD_TARGET
|
||||
MPS_TARGET_NAME
|
||||
MPS_BUILD_NAME
|
||||
MPS_ARCH_NAME
|
||||
MPS_OS_NAME
|
||||
MAKE
|
||||
host_os
|
||||
host_vendor
|
||||
|
|
@ -1243,7 +1245,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures Memory Pool System Kit release/1.113.0 to adapt to many kinds of systems.
|
||||
\`configure' configures Memory Pool System Kit release/1.114.0 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1308,7 +1310,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of Memory Pool System Kit release/1.113.0:";;
|
||||
short | recursive ) echo "Configuration of Memory Pool System Kit release/1.114.0:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1389,7 +1391,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
Memory Pool System Kit configure release/1.113.0
|
||||
Memory Pool System Kit configure release/1.114.0
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
|
@ -1691,7 +1693,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by Memory Pool System Kit $as_me release/1.113.0, which was
|
||||
It was created by Memory Pool System Kit $as_me release/1.114.0, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -3455,25 +3457,33 @@ case $host/$CLANG in
|
|||
i*86-*-linux*/no)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux x86" >&5
|
||||
$as_echo "Linux x86" >&6; }
|
||||
MPS_TARGET_NAME=lii3gc
|
||||
MPS_OS_NAME=li
|
||||
MPS_ARCH_NAME=i3
|
||||
MPS_BUILD_NAME=gc
|
||||
PFMCFLAGS="$CFLAGS_GC"
|
||||
;;
|
||||
x86_64-*-linux*/no)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux x86_64" >&5
|
||||
$as_echo "Linux x86_64" >&6; }
|
||||
MPS_TARGET_NAME=lii6gc
|
||||
MPS_OS_NAME=li
|
||||
MPS_ARCH_NAME=i6
|
||||
MPS_BUILD_NAME=gc
|
||||
PFMCFLAGS="$CFLAGS_GC"
|
||||
;;
|
||||
x86_64-*-linux*/yes)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux x86_64" >&5
|
||||
$as_echo "Linux x86_64" >&6; }
|
||||
MPS_TARGET_NAME=lii6ll
|
||||
MPS_OS_NAME=li
|
||||
MPS_ARCH_NAME=i6
|
||||
MPS_BUILD_NAME=ll
|
||||
PFMCFLAGS="$CFLAGS_LL"
|
||||
;;
|
||||
i*86-*-darwin*/*)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Mac OS X x86" >&5
|
||||
$as_echo "Mac OS X x86" >&6; }
|
||||
MPS_TARGET_NAME=xci3ll
|
||||
MPS_OS_NAME=xc
|
||||
MPS_ARCH_NAME=i3
|
||||
MPS_BUILD_NAME=ll
|
||||
BUILD_TARGET=build-via-xcode
|
||||
CLEAN_TARGET=clean-xcode-build
|
||||
INSTALL_TARGET=install-xcode-build
|
||||
|
|
@ -3483,7 +3493,9 @@ $as_echo "Mac OS X x86" >&6; }
|
|||
x86_64-apple-darwin*/*)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Mac OS X x86_64" >&5
|
||||
$as_echo "Mac OS X x86_64" >&6; }
|
||||
MPS_TARGET_NAME=xci6ll
|
||||
MPS_OS_NAME=xc
|
||||
MPS_ARCH_NAME=i6
|
||||
MPS_BUILD_NAME=ll
|
||||
BUILD_TARGET=build-via-xcode
|
||||
CLEAN_TARGET=clean-xcode-build
|
||||
INSTALL_TARGET=install-xcode-build
|
||||
|
|
@ -3493,7 +3505,9 @@ $as_echo "Mac OS X x86_64" >&6; }
|
|||
i*86-*-freebsd*/no)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeBSD x86" >&5
|
||||
$as_echo "FreeBSD x86" >&6; }
|
||||
MPS_TARGET_NAME=fri3gc
|
||||
MPS_OS_NAME=fr
|
||||
MPS_ARCH_NAME=i3
|
||||
MPS_BUILD_NAME=gc
|
||||
# Need /usr/local/include in order to find sqlite3.h
|
||||
CFLAGS="-I/usr/local/include"
|
||||
CPP="$CC -I/usr/local/include -E"
|
||||
|
|
@ -3502,7 +3516,9 @@ $as_echo "FreeBSD x86" >&6; }
|
|||
amd64-*-freebsd*/no | x86_64-*-freebsd*/no)
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeBSD x86_64" >&5
|
||||
$as_echo "FreeBSD x86_64" >&6; }
|
||||
MPS_TARGET_NAME=fri6gc
|
||||
MPS_OS_NAME=fr
|
||||
MPS_ARCH_NAME=i6
|
||||
MPS_BUILD_NAME=gc
|
||||
# Need /usr/local/include in order to find sqlite3.h
|
||||
CFLAGS="-I/usr/local/include"
|
||||
CPP="$CC -I/usr/local/include -E"
|
||||
|
|
@ -3581,6 +3597,8 @@ CFLAGS="$CFLAGS $PFMCFLAGS"
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile example/scheme/Makefile"
|
||||
|
||||
|
||||
|
|
@ -4126,7 +4144,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by Memory Pool System Kit $as_me release/1.113.0, which was
|
||||
This file was extended by Memory Pool System Kit $as_me release/1.114.0, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -4180,7 +4198,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
Memory Pool System Kit config.status release/1.113.0
|
||||
Memory Pool System Kit config.status release/1.114.0
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -47,22 +47,30 @@ TEST_TARGET=test-make-build
|
|||
case $host/$CLANG in
|
||||
i*86-*-linux*/no)
|
||||
AC_MSG_RESULT([Linux x86])
|
||||
MPS_TARGET_NAME=lii3gc
|
||||
MPS_OS_NAME=li
|
||||
MPS_ARCH_NAME=i3
|
||||
MPS_BUILD_NAME=gc
|
||||
PFMCFLAGS="$CFLAGS_GC"
|
||||
;;
|
||||
x86_64-*-linux*/no)
|
||||
AC_MSG_RESULT([Linux x86_64])
|
||||
MPS_TARGET_NAME=lii6gc
|
||||
MPS_OS_NAME=li
|
||||
MPS_ARCH_NAME=i6
|
||||
MPS_BUILD_NAME=gc
|
||||
PFMCFLAGS="$CFLAGS_GC"
|
||||
;;
|
||||
x86_64-*-linux*/yes)
|
||||
AC_MSG_RESULT([Linux x86_64])
|
||||
MPS_TARGET_NAME=lii6ll
|
||||
MPS_OS_NAME=li
|
||||
MPS_ARCH_NAME=i6
|
||||
MPS_BUILD_NAME=ll
|
||||
PFMCFLAGS="$CFLAGS_LL"
|
||||
;;
|
||||
i*86-*-darwin*/*)
|
||||
AC_MSG_RESULT([Mac OS X x86])
|
||||
MPS_TARGET_NAME=xci3ll
|
||||
MPS_OS_NAME=xc
|
||||
MPS_ARCH_NAME=i3
|
||||
MPS_BUILD_NAME=ll
|
||||
BUILD_TARGET=build-via-xcode
|
||||
CLEAN_TARGET=clean-xcode-build
|
||||
INSTALL_TARGET=install-xcode-build
|
||||
|
|
@ -71,7 +79,9 @@ case $host/$CLANG in
|
|||
;;
|
||||
x86_64-apple-darwin*/*)
|
||||
AC_MSG_RESULT([Mac OS X x86_64])
|
||||
MPS_TARGET_NAME=xci6ll
|
||||
MPS_OS_NAME=xc
|
||||
MPS_ARCH_NAME=i6
|
||||
MPS_BUILD_NAME=ll
|
||||
BUILD_TARGET=build-via-xcode
|
||||
CLEAN_TARGET=clean-xcode-build
|
||||
INSTALL_TARGET=install-xcode-build
|
||||
|
|
@ -80,7 +90,9 @@ case $host/$CLANG in
|
|||
;;
|
||||
i*86-*-freebsd*/no)
|
||||
AC_MSG_RESULT([FreeBSD x86])
|
||||
MPS_TARGET_NAME=fri3gc
|
||||
MPS_OS_NAME=fr
|
||||
MPS_ARCH_NAME=i3
|
||||
MPS_BUILD_NAME=gc
|
||||
# Need /usr/local/include in order to find sqlite3.h
|
||||
CFLAGS="-I/usr/local/include"
|
||||
CPP="$CC -I/usr/local/include -E"
|
||||
|
|
@ -88,7 +100,9 @@ case $host/$CLANG in
|
|||
;;
|
||||
amd64-*-freebsd*/no | x86_64-*-freebsd*/no)
|
||||
AC_MSG_RESULT([FreeBSD x86_64])
|
||||
MPS_TARGET_NAME=fri6gc
|
||||
MPS_OS_NAME=fr
|
||||
MPS_ARCH_NAME=i6
|
||||
MPS_BUILD_NAME=gc
|
||||
# Need /usr/local/include in order to find sqlite3.h
|
||||
CFLAGS="-I/usr/local/include"
|
||||
CPP="$CC -I/usr/local/include -E"
|
||||
|
|
@ -111,7 +125,9 @@ AC_CHECK_HEADER([sqlite3.h], [EXTRA_TARGETS="$EXTRA_TARGETS mpseventsql"])
|
|||
# those flags.
|
||||
CFLAGS="$CFLAGS $PFMCFLAGS"
|
||||
|
||||
AC_SUBST(MPS_TARGET_NAME)
|
||||
AC_SUBST(MPS_OS_NAME)
|
||||
AC_SUBST(MPS_ARCH_NAME)
|
||||
AC_SUBST(MPS_BUILD_NAME)
|
||||
AC_SUBST(BUILD_TARGET)
|
||||
AC_SUBST(CLEAN_TARGET)
|
||||
AC_SUBST(INSTALL_TARGET)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue