diff options
| author | John Criswell <criswell@uiuc.edu> | 2004-02-10 22:34:44 +0000 |
|---|---|---|
| committer | John Criswell <criswell@uiuc.edu> | 2004-02-10 22:34:44 +0000 |
| commit | b54aa6e6a65a033e6a84da8b47b472e1400d01ab (patch) | |
| tree | bd77ea54a84e37853d013d9ebc5ff2c21895065b | |
| parent | b0360554413cf23cecedb4d89332ae0383581b97 (diff) | |
Allow for SPEC 2000 and SPEC 95 to be enabled independently of each other.
git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@11297 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | External/Makefile | 3 | ||||
| -rw-r--r-- | External/SPEC/Makefile | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/External/Makefile b/External/Makefile index 8dee2cf4..dd84ce9b 100644 --- a/External/Makefile +++ b/External/Makefile @@ -9,8 +9,5 @@ include ${LEVEL}/Makefile.config # Create the list of directories to compile # DIRS := SPEC -ifndef USE_SPEC -DIRS := $(filter-out SPEC/, $(DIRS)) -endif include ${LEVEL}/test/Programs/Makefile.programs diff --git a/External/SPEC/Makefile b/External/SPEC/Makefile index 7950b507..c8b58027 100644 --- a/External/SPEC/Makefile +++ b/External/SPEC/Makefile @@ -1,12 +1,17 @@ LEVEL = ../../../.. -DIRS := CFP2000 CINT2000 +DIRS := CINT95 CFP2000 CINT2000 include ${LEVEL}/Makefile.config # -# Add SPEC95 if we've got it. +# Remove SPEC95 and SPEC2000 per the user's configuration # -ifeq ($(USE_SPEC95),1) -DIRS += CINT95 +ifndef USE_SPEC +DIRS := $(filter-out CFP2000/, $(DIRS)) +DIRS := $(filter-out CINT2000/, $(DIRS)) +endif + +ifndef USE_SPEC95 +DIRS := $(filter-out CINT95/, $(DIRS)) endif include ${LEVEL}/test/Programs/Makefile.programs |