Removed LLVM hooks

svn: r8398
This commit is contained in:
Eli Barzilay 2008-01-24 16:07:57 +00:00
parent 91f9635c1e
commit 713fb06100
3 changed files with 1 additions and 59 deletions

31
src/configure vendored
View File

@ -733,7 +733,6 @@ FOREIGN_CONVENIENCE
FOREIGNTARGET FOREIGNTARGET
LIBMZSCHEME_DEP LIBMZSCHEME_DEP
LIBMRED_DEP LIBMRED_DEP
LLVMTARGET
LTO LTO
LTA LTA
collectsdir collectsdir
@ -766,7 +765,6 @@ CCC
CXXCPP CXXCPP
XMKMF' XMKMF'
ac_subdirs_all='foreign/gcc/libffi ac_subdirs_all='foreign/gcc/libffi
llvm/llvm
wxcommon/jpeg wxcommon/jpeg
wxxt/src/x/wbuild ' wxxt/src/x/wbuild '
@ -1345,7 +1343,6 @@ Optional Features:
--enable-lt=<prog> use <prog> instead of bundled libtool --enable-lt=<prog> use <prog> instead of bundled libtool
--enable-origtree install with original directory structure --enable-origtree install with original directory structure
--enable-foreign compile foreign support (enabled by default) --enable-foreign compile foreign support (enabled by default)
--enable-llvm compile llvm support (disabled by default)
--enable-cgcdefault use CGC (Boehm or Senora) as default build --enable-cgcdefault use CGC (Boehm or Senora) as default build
--enable-sgc use Senora GC instead of the Boehm GC --enable-sgc use Senora GC instead of the Boehm GC
--enable-sgcdebug use Senora GC for debugging --enable-sgcdebug use Senora GC for debugging
@ -1883,13 +1880,6 @@ else
enable_foreign=yes enable_foreign=yes
fi fi
# Check whether --enable-llvm was given.
if test "${enable_llvm+set}" = set; then
enableval=$enable_llvm;
else
enable_llvm=no
fi
# Check whether --enable-cgcdefault was given. # Check whether --enable-cgcdefault was given.
if test "${enable_cgcdefault+set}" = set; then if test "${enable_cgcdefault+set}" = set; then
@ -2207,7 +2197,6 @@ fi
show_explicitly_enabled "${enable_orig}" "Original install tree" show_explicitly_enabled "${enable_orig}" "Original install tree"
show_explicitly_disabled "${enable_foreign}" Foreign show_explicitly_disabled "${enable_foreign}" Foreign
show_explicitly_enabled "${enable_llvm}" LLVM
show_explicitly_enabled "${enable_sgc}" SGC show_explicitly_enabled "${enable_sgc}" SGC
show_explicitly_enabled "${enable_sgcdebug}" "SGC debug mode" show_explicitly_enabled "${enable_sgcdebug}" "SGC debug mode"
@ -11783,8 +11772,6 @@ LIBS="$LIBS $EXTRALIBS"
@ -11856,21 +11843,6 @@ else
MZOPTIONS="$MZOPTIONS -DDONT_USE_FOREIGN" MZOPTIONS="$MZOPTIONS -DDONT_USE_FOREIGN"
fi fi
LLVMTARGET=
if test -d "${srcdir}/llvm" && test "${enable_llvm}" = "yes" ; then
subdirs="$subdirs llvm/llvm"
makefiles="$makefiles llvm/Makefile"
LLVMTARGET="llvm-stuff"
# Again, this changes arguments that are passed to *all* sub-configure
# invocations, which might be a problem. Hopefully nobody else uses
# "--enable-targets" and if someone else uses "--enable-optimized" we might
# as well just go with it...
ac_configure_args="$ac_configure_args --enable-optimized --enable-targets=host-only"
else
LLVMTARGET="llvm-nothing"
fi
if test "${enable_mred}" = "yes" ; then if test "${enable_mred}" = "yes" ; then
if test "${enable_quartz}" = "yes" ; then if test "${enable_quartz}" = "yes" ; then
mk_needed_dir wxmac mk_needed_dir wxmac
@ -12749,7 +12721,6 @@ FOREIGN_CONVENIENCE!$FOREIGN_CONVENIENCE$ac_delim
FOREIGNTARGET!$FOREIGNTARGET$ac_delim FOREIGNTARGET!$FOREIGNTARGET$ac_delim
LIBMZSCHEME_DEP!$LIBMZSCHEME_DEP$ac_delim LIBMZSCHEME_DEP!$LIBMZSCHEME_DEP$ac_delim
LIBMRED_DEP!$LIBMRED_DEP$ac_delim LIBMRED_DEP!$LIBMRED_DEP$ac_delim
LLVMTARGET!$LLVMTARGET$ac_delim
LTO!$LTO$ac_delim LTO!$LTO$ac_delim
LTA!$LTA$ac_delim LTA!$LTA$ac_delim
collectsdir!$collectsdir$ac_delim collectsdir!$collectsdir$ac_delim
@ -12768,7 +12739,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then
break break
elif $ac_last_try; then elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

View File

@ -36,8 +36,6 @@ FOREIGN_OBJSLIB = @FOREIGN_OBJSLIB@
# The foreign build always uses libtool, so that's why we use .la instead of @LTA@ # The foreign build always uses libtool, so that's why we use .la instead of @LTA@
# in FOREIGN_LIB. # in FOREIGN_LIB.
LLVM_DIR = ../llvm
# About EXE_SUFFIX: # About EXE_SUFFIX:
# Cygwin offers the illusion that binaries have no ".exe" suffix by # Cygwin offers the illusion that binaries have no ".exe" suffix by
# having the file-open syscall open an ".exe" file for reading when # having the file-open syscall open an ".exe" file for reading when
@ -57,7 +55,6 @@ normal-bin:
common: common:
$(MAKE) g-c $(MAKE) g-c
$(MAKE) @FOREIGNTARGET@ $(MAKE) @FOREIGNTARGET@
$(MAKE) @LLVMTARGET@
cgc: cgc:
$(MAKE) common $(MAKE) common
@ -114,13 +111,6 @@ foreign-stuff:
foreign-nothing: foreign-nothing:
echo no foreign echo no foreign
# llvm
llvm-stuff:
cd $(LLVM_DIR); $(MAKE) all
llvm-nothing:
echo no llvm
mzlibrary: mzlibrary:
cd src; $(MAKE) all cd src; $(MAKE) all
$(MAKE) libmzscheme.@LIBSFX@ $(MAKE) libmzscheme.@LIBSFX@
@ -227,7 +217,6 @@ clean@NOT_OSX@:
cd src; $(MAKE) clean cd src; $(MAKE) clean
cd dynsrc; $(MAKE) clean cd dynsrc; $(MAKE) clean
if [ -d ../foreign ] ; then cd ../foreign ; $(MAKE) clean ; fi if [ -d ../foreign ] ; then cd ../foreign ; $(MAKE) clean ; fi
if [ -d ../llvm ] ; then cd ../llvm ; $(MAKE) clean ; fi
clean@OSX@: clean@OSX@:
rm -rf PLT_MzScheme.framework rm -rf PLT_MzScheme.framework

View File

@ -40,7 +40,6 @@ AC_ARG_ENABLE(lt, [ --enable-lt=<prog> use <prog> instead of bundled
AC_ARG_ENABLE(origtree,[ --enable-origtree install with original directory structure]) AC_ARG_ENABLE(origtree,[ --enable-origtree install with original directory structure])
AC_ARG_ENABLE(foreign, [ --enable-foreign compile foreign support (enabled by default)], , enable_foreign=yes) AC_ARG_ENABLE(foreign, [ --enable-foreign compile foreign support (enabled by default)], , enable_foreign=yes)
AC_ARG_ENABLE(llvm, [ --enable-llvm compile llvm support (disabled by default)], , enable_llvm=no)
AC_ARG_ENABLE(cgcdefault, [ --enable-cgcdefault use CGC (Boehm or Senora) as default build]) AC_ARG_ENABLE(cgcdefault, [ --enable-cgcdefault use CGC (Boehm or Senora) as default build])
AC_ARG_ENABLE(sgc, [ --enable-sgc use Senora GC instead of the Boehm GC]) AC_ARG_ENABLE(sgc, [ --enable-sgc use Senora GC instead of the Boehm GC])
@ -272,7 +271,6 @@ fi
show_explicitly_enabled "${enable_orig}" "Original install tree" show_explicitly_enabled "${enable_orig}" "Original install tree"
show_explicitly_disabled "${enable_foreign}" Foreign show_explicitly_disabled "${enable_foreign}" Foreign
show_explicitly_enabled "${enable_llvm}" LLVM
show_explicitly_enabled "${enable_sgc}" SGC show_explicitly_enabled "${enable_sgc}" SGC
show_explicitly_enabled "${enable_sgcdebug}" "SGC debug mode" show_explicitly_enabled "${enable_sgcdebug}" "SGC debug mode"
@ -1332,8 +1330,6 @@ AC_SUBST(FOREIGNTARGET)
AC_SUBST(LIBMZSCHEME_DEP) AC_SUBST(LIBMZSCHEME_DEP)
AC_SUBST(LIBMRED_DEP) AC_SUBST(LIBMRED_DEP)
AC_SUBST(LLVMTARGET)
AC_SUBST(LTO) AC_SUBST(LTO)
AC_SUBST(LTA) AC_SUBST(LTA)
@ -1388,20 +1384,6 @@ else
MZOPTIONS="$MZOPTIONS -DDONT_USE_FOREIGN" MZOPTIONS="$MZOPTIONS -DDONT_USE_FOREIGN"
fi fi
LLVMTARGET=
if test -d "${srcdir}/llvm" && test "${enable_llvm}" = "yes" ; then
AC_CONFIG_SUBDIRS( llvm/llvm )
makefiles="$makefiles llvm/Makefile"
LLVMTARGET="llvm-stuff"
# Again, this changes arguments that are passed to *all* sub-configure
# invocations, which might be a problem. Hopefully nobody else uses
# "--enable-targets" and if someone else uses "--enable-optimized" we might
# as well just go with it...
ac_configure_args="$ac_configure_args --enable-optimized --enable-targets=host-only"
else
LLVMTARGET="llvm-nothing"
fi
if test "${enable_mred}" = "yes" ; then if test "${enable_mred}" = "yes" ; then
if test "${enable_quartz}" = "yes" ; then if test "${enable_quartz}" = "yes" ; then
mk_needed_dir wxmac mk_needed_dir wxmac