[llvm-commits] CVS: llvm-test/External/SPEC/Makefile.spec

[Nate Begeman]

Changes in directory llvm-test/External/SPEC:

Makefile.spec updated: 1.52 -> 1.53
---
Log message:

Allow people to override the default SPEC directory


---
Diffs of the changes:  (+11 -1)

 Makefile.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletion(-)


Index: llvm-test/External/SPEC/Makefile.spec
diff -u llvm-test/External/SPEC/Makefile.spec:1.52 llvm-test/External/SPEC/Makefile.spec:1.53
--- llvm-test/External/SPEC/Makefile.spec:1.52	Fri Feb 24 13:04:54 2006
+++ llvm-test/External/SPEC/Makefile.spec	Mon Feb 27 16:11:02 2006
@@ -18,11 +18,19 @@
 #
 CURRENT_DIR := $(shell cd .; pwd)
 BENCH_NAME  := $(subst $(shell cd ..   ; pwd),,$(CURRENT_DIR))
-SPEC_SUBDIR := $(subst $(shell cd ../..; pwd),,$(CURRENT_DIR))
 
 # Remove any leading /'s from the paths
 BENCH_NAME  := $(patsubst /%,%,$(BENCH_NAME))
+
+## SPEC_SUITEDIR - Allow SPEC configuration files to override "CINT2000" with
+## something else.
+
+ifndef SPEC_SUITEDIR
+SPEC_SUBDIR := $(subst $(shell cd ../..; pwd),,$(CURRENT_DIR))
 SPEC_SUBDIR := $(patsubst /%,%,$(SPEC_SUBDIR))
+else
+SPEC_SUBDIR := $(SPEC_SUITEDIR)/$(BENCH_NAME)
+endif
 
 ifndef SPEC_BENCH_DIR
 SPEC_BENCH_DIR := $(SPEC_ROOT)/$(SPEC_SUBDIR)
@@ -31,9 +39,11 @@
 PROG := $(BENCH_NAME)
 ifndef Source
 Source := $(wildcard $(SPEC_BENCH_DIR)/src/*.c \
+					 $(SPEC_BENCH_DIR)/src/*.C \
                      $(SPEC_BENCH_DIR)/src/*.cc \
                      $(SPEC_BENCH_DIR)/src/*.cpp \
                      $(SPEC_BENCH_DIR)/src/*.f \
+                     $(SPEC_BENCH_DIR)/src/*.F \
                      $(SPEC_BENCH_DIR)/src/*.f90 \
                      $(SPEC_BENCH_DIR)/src/*.F90)
 endif