diff options
| author | Mikhail Glushenkov <foldr@codedgers.com> | 2009-07-04 03:55:25 +0000 |
|---|---|---|
| committer | Mikhail Glushenkov <foldr@codedgers.com> | 2009-07-04 03:55:25 +0000 |
| commit | cc4f8bcedc44920ce0a50619f4f667b28b40dffa (patch) | |
| tree | 4ed15ba805f64fc1c6a5d74101547bb044088c08 | |
| parent | 86a3510a68928885412a00e1698ab0297dcaf199 (diff) | |
| download | llvm-cc4f8bcedc44920ce0a50619f4f667b28b40dffa.tar.gz llvm-cc4f8bcedc44920ce0a50619f4f667b28b40dffa.tar.bz2 llvm-cc4f8bcedc44920ce0a50619f4f667b28b40dffa.tar.xz | |
LLVMC can be now compiled w/o dynamic plugin support.
Controlled via the --enable-llvmc-dynamic-plugins option.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74784 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.config.in | 5 | ||||
| -rw-r--r-- | autoconf/configure.ac | 13 | ||||
| -rw-r--r-- | lib/CompilerDriver/BuiltinOptions.cpp | 3 | ||||
| -rw-r--r-- | lib/CompilerDriver/Makefile | 4 |
4 files changed, 24 insertions, 1 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index e715902814..e2d2c57b4d 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -303,3 +303,8 @@ BINUTILS_INCDIR := @BINUTILS_INCDIR@ # (Windows). ENABLE_LLVMC_DYNAMIC = 0 #@ENABLE_LLVMC_DYNAMIC@ + +# When ENABLE_LLVMC_DYNAMIC_PLUGINS is enabled, LLVMC will have dynamic plugin +# support (via the -load option). +ENABLE_LLVMC_DYNAMIC_PLUGINS = 1 +#@ENABLE_LLVMC_DYNAMIC_PLUGINS@ diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 3812222c6d..6b3c4caac0 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -605,12 +605,23 @@ AC_ARG_ENABLE(llvmc-dynamic,AS_HELP_STRING( --enable-llvmc-dynamic, [Link LLVMC dynamically (default is NO, unless on Win32)]),, enableval=$llvmc_dynamic) -if test ${enableval} = "yes" && test "$ENABLE_PIC" -eq 1; then +if test ${enableval} = "yes" && test "$ENABLE_PIC" -eq 1 ; then AC_SUBST(ENABLE_LLVMC_DYNAMIC,[[ENABLE_LLVMC_DYNAMIC=1]]) else AC_SUBST(ENABLE_LLVMC_DYNAMIC,[[]]) fi +dnl --enable-llvmc-dynamic-plugins : should LLVMC support dynamic plugins? +AC_ARG_ENABLE(llvmc-dynamic-plugins,AS_HELP_STRING( +--enable-llvmc-dynamic-plugins, +[Enable dynamic LLVMC plugins (default is YES)]),, +enableval=yes) +if test ${enableval} = "yes" ; then + AC_SUBST(ENABLE_LLVMC_DYNAMIC_PLUGINS,[[ENABLE_LLVMC_DYNAMIC_PLUGINS=1]]) +else + AC_SUBST(ENABLE_LLVMC_DYNAMIC_PLUGINS,[[]]) +fi + dnl===-----------------------------------------------------------------------=== dnl=== dnl=== SECTION 4: Check for programs we need and that they are the right version diff --git a/lib/CompilerDriver/BuiltinOptions.cpp b/lib/CompilerDriver/BuiltinOptions.cpp index c8b768219a..a3364e8a72 100644 --- a/lib/CompilerDriver/BuiltinOptions.cpp +++ b/lib/CompilerDriver/BuiltinOptions.cpp @@ -12,7 +12,10 @@ //===----------------------------------------------------------------------===// #include "llvm/CompilerDriver/BuiltinOptions.h" + +#ifdef ENABLE_LLVMC_DYNAMIC_PLUGINS #include "llvm/Support/PluginLoader.h" +#endif namespace cl = llvm::cl; diff --git a/lib/CompilerDriver/Makefile b/lib/CompilerDriver/Makefile index 6084e88518..a5ecfd5d32 100644 --- a/lib/CompilerDriver/Makefile +++ b/lib/CompilerDriver/Makefile @@ -25,6 +25,10 @@ REQUIRES_EH := 1 include $(LEVEL)/Makefile.common +ifeq ($(ENABLE_LLVMC_DYNAMIC_PLUGINS), 1) + CPP.Flags += -DENABLE_LLVMC_DYNAMIC_PLUGINS +endif + # Copy libCompilerDriver to the bin dir so that llvmc can find it. ifeq ($(ENABLE_LLVMC_DYNAMIC),1) |