[vmkit-commits] [vmkit] r54683 - in /vmkit/trunk: Makefile.common.in Makefile.config.in autoconf/configure.ac configure
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Tue Aug 12 06:22:29 PDT 2008
Author: geoffray
Date: Tue Aug 12 08:22:29 2008
New Revision: 54683
URL: http://llvm.org/viewvc/llvm-project?rev=54683&view=rev
Log:
Fix compilation of isolate build.
Modified:
vmkit/trunk/Makefile.common.in
vmkit/trunk/Makefile.config.in
vmkit/trunk/autoconf/configure.ac
vmkit/trunk/configure
Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=54683&r1=54682&r2=54683&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Tue Aug 12 08:22:29 2008
@@ -23,7 +23,7 @@
# Include LLVM's Master Makefile.
include $(LLVM_OBJ_ROOT)/Makefile.common
-CXX.Flags += @GC_FLAGS@ -Wno-variadic-macros -fno-omit-frame-pointer -ansi
+CXX.Flags += @GC_FLAGS@ @VM_FLAGS@ -Wno-variadic-macros -fno-omit-frame-pointer -ansi
# GNU Classpath flags
CLASSPATH_FLAGS = @classpathinclude@
Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=54683&r1=54682&r2=54683&view=diff
==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Tue Aug 12 08:22:29 2008
@@ -7,3 +7,5 @@
GC_SINGLE_MMAP = @GC_SINGLE_MMAP@
GC_BOEHM = @GC_BOEHM@
GC_MMAP2 = @GC_MMAP2@
+ISOLATE_BUILD = @ISOLATE_BUILD@
+SERVICE_BUILD = @SERVICE_BUILD@
Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=54683&r1=54682&r2=54683&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Tue Aug 12 08:22:29 2008
@@ -222,18 +222,19 @@
)
if test "x$vmtype" = "xmulti"; then
- CFLAGS="$CFLAGS -DMULTIPLE_VM"
- CXXFLAGS="$CXXFLAGS -DMULTIPLE_VM"
+ VM_FLAGS="-DMULTIPLE_VM"
+ ISOLATE_BUILD=1
else
if test "x$vmtype" = "xservice"; then
- CFLAGS="$CFLAGS -DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I$PWD/lib/Mvm/Allocator"
- CXXFLAGS="$CXXFLAGS -DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I$PWD/lib/Mvm/Allocator"
+ VM_FLAGS="-DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I$PWD/lib/Mvm/Allocator"
+ SERVICE_BUILD=1
fi
fi
-AM_CONDITIONAL([SERVICE_BUILD], [test "x$vmtype" = "xservice"])
-AM_CONDITIONAL([ISOLATE_BUILD], [test "x$vmtype" = "xmulti"])
-
+AC_SUBST([SERVICE_BUILD])
+AC_SUBST([ISOLATE_BUILD])
+AC_SUBST([VM_FLAGS])
+
dnl **************************************************************************
dnl GNU CLASSPATH installation prefix
dnl **************************************************************************
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=54683&r1=54682&r2=54683&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Tue Aug 12 08:22:29 2008
@@ -687,10 +687,9 @@
GC_SINGLE_MMAP
GC_FLAGS
GC_LIBS
-SERVICE_BUILD_TRUE
-SERVICE_BUILD_FALSE
-ISOLATE_BUILD_TRUE
-ISOLATE_BUILD_FALSE
+SERVICE_BUILD
+ISOLATE_BUILD
+VM_FLAGS
classpathglibj
classpathlibs
classpathinclude
@@ -3943,30 +3942,17 @@
if test "x$vmtype" = "xmulti"; then
- CFLAGS="$CFLAGS -DMULTIPLE_VM"
- CXXFLAGS="$CXXFLAGS -DMULTIPLE_VM"
+ VM_FLAGS="-DMULTIPLE_VM"
+ ISOLATE_BUILD=1
else
if test "x$vmtype" = "xservice"; then
- CFLAGS="$CFLAGS -DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I$PWD/lib/Mvm/Allocator"
- CXXFLAGS="$CXXFLAGS -DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I$PWD/lib/Mvm/Allocator"
+ VM_FLAGS="-DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I$PWD/lib/Mvm/Allocator"
+ SERVICE_BUILD=1
fi
fi
- if test "x$vmtype" = "xservice"; then
- SERVICE_BUILD_TRUE=
- SERVICE_BUILD_FALSE='#'
-else
- SERVICE_BUILD_TRUE='#'
- SERVICE_BUILD_FALSE=
-fi
- if test "x$vmtype" = "xmulti"; then
- ISOLATE_BUILD_TRUE=
- ISOLATE_BUILD_FALSE='#'
-else
- ISOLATE_BUILD_TRUE='#'
- ISOLATE_BUILD_FALSE=
-fi
+
@@ -7242,20 +7228,6 @@
LTLIBOBJS=$ac_ltlibobjs
-if test -z "${SERVICE_BUILD_TRUE}" && test -z "${SERVICE_BUILD_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"SERVICE_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"SERVICE_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${ISOLATE_BUILD_TRUE}" && test -z "${ISOLATE_BUILD_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ISOLATE_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ISOLATE_BUILD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -7862,10 +7834,9 @@
GC_SINGLE_MMAP!$GC_SINGLE_MMAP$ac_delim
GC_FLAGS!$GC_FLAGS$ac_delim
GC_LIBS!$GC_LIBS$ac_delim
-SERVICE_BUILD_TRUE!$SERVICE_BUILD_TRUE$ac_delim
-SERVICE_BUILD_FALSE!$SERVICE_BUILD_FALSE$ac_delim
-ISOLATE_BUILD_TRUE!$ISOLATE_BUILD_TRUE$ac_delim
-ISOLATE_BUILD_FALSE!$ISOLATE_BUILD_FALSE$ac_delim
+SERVICE_BUILD!$SERVICE_BUILD$ac_delim
+ISOLATE_BUILD!$ISOLATE_BUILD$ac_delim
+VM_FLAGS!$VM_FLAGS$ac_delim
classpathglibj!$classpathglibj$ac_delim
classpathlibs!$classpathlibs$ac_delim
classpathinclude!$classpathinclude$ac_delim
@@ -7890,6 +7861,7 @@
MV!$MV$ac_delim
RANLIB!$RANLIB$ac_delim
RM!$RM$ac_delim
+SED!$SED$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -7931,7 +7903,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-SED!$SED$ac_delim
TAR!$TAR$ac_delim
BINPWD!$BINPWD$ac_delim
CAT!$CAT$ac_delim
@@ -7946,7 +7917,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
More information about the vmkit-commits
mailing list