diff options
| -rw-r--r-- | llvm/autoconf/configure.ac | 3 | ||||
| -rwxr-xr-x | llvm/configure | 3 | ||||
| -rw-r--r-- | llvm/projects/Makefile | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac index 15cfa347c3d..42d2985d535 100644 --- a/llvm/autoconf/configure.ac +++ b/llvm/autoconf/configure.ac @@ -70,7 +70,10 @@ do sample) AC_CONFIG_SUBDIRS([projects/sample]) ;; privbracket) AC_CONFIG_SUBDIRS([projects/privbracket]) ;; llvm-stacker) AC_CONFIG_SUBDIRS([projects/llvm-stacker]) ;; + # llvm-test is the old name of the test-suite, kept here for backwards + # compatibility llvm-test) AC_CONFIG_SUBDIRS([projects/llvm-test]) ;; + test-suite) AC_CONFIG_SUBDIRS([projects/test-suite]) ;; llvm-reopt) AC_CONFIG_SUBDIRS([projects/llvm-reopt]);; llvm-gcc) AC_CONFIG_SUBDIRS([projects/llvm-gcc]) ;; llvm-java) AC_CONFIG_SUBDIRS([projects/llvm-java]) ;; diff --git a/llvm/configure b/llvm/configure index 820f66f12e3..83a44a05af1 100755 --- a/llvm/configure +++ b/llvm/configure @@ -951,6 +951,7 @@ ac_subdirs_all='projects/sample projects/privbracket projects/llvm-stacker projects/llvm-test +projects/test-suite projects/llvm-reopt projects/llvm-gcc projects/llvm-java @@ -2091,6 +2092,8 @@ do ;; llvm-test) subdirs="$subdirs projects/llvm-test" ;; + test-suite) subdirs="$subdirs projects/test-suite" + ;; llvm-reopt) subdirs="$subdirs projects/llvm-reopt" ;; llvm-gcc) subdirs="$subdirs projects/llvm-gcc" diff --git a/llvm/projects/Makefile b/llvm/projects/Makefile index b6228b87f91..b966fc7f780 100644 --- a/llvm/projects/Makefile +++ b/llvm/projects/Makefile @@ -10,7 +10,9 @@ LEVEL=.. include $(LEVEL)/Makefile.config -DIRS:= $(filter-out llvm-test,$(patsubst $(PROJ_SRC_DIR)/%/Makefile,%,$(wildcard $(PROJ_SRC_DIR)/*/Makefile))) +# Compile all subdirs, except for the test suite, which lives in test-suite. +# Before 2008.06.24 it lived in llvm-test, so exclude that as well for now. +DIRS:= $(filter-out llvm-test test-suite,$(patsubst $(PROJ_SRC_DIR)/%/Makefile,%,$(wildcard $(PROJ_SRC_DIR)/*/Makefile))) # Sparc cannot link shared libraries (libtool problem?) ifeq ($(ARCH), Sparc) |
