Added configuration-time option

OPTIMISE=no

to switch off optimisation flags for quicker compiling. The known
architectures files can now contain

C_OPTIMISE_FLAGS
CXX_OPTIMISE_FLAGS
F77_OPTIMISE_FLAGS
F90_OPTIMISE_FLAGS


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1395 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 17 insertions, 17 deletions

diff --git a/lib/make/make.config.rules.in b/lib/make/make.config.rules.in
index 80c9bfb7..00bc110b 100644
--- a/lib/make/make.config.rules.in
+++ b/lib/make/make.config.rules.in
@@ -66,9 +66,9 @@ endef
 define PREPROCESS_C
 cat $< | $(PERL) $(C_FILE_PROCESSOR) $(CONFIG) > $(notdir $<)
 endef
-
+ 
 define COMPILE_C 
-current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CC) $(DEBUG_C) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE
+current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CC) $(OPTIMISE_C) $(DEBUG_C) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE
 endef
 
 define POSTPROCESS_C
@@ -80,7 +80,7 @@ cat $< | $(PERL) $(C_FILE_PROCESSOR) $(CONFIG) > $(notdir $<)
 endef
 
 define COMPILE_CXX
-current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CXX) $(DEBUG_CXX) $(CXXFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE
+current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(CXX) $(OPTIMISE_CXX) $(DEBUG_CXX) $(CXXFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(notdir $<) $(INC_DIRS:%=-I%) $(EXTRA_DEFINES:%=-D%) -DCCODE
 endef
 
 define POSTPROCESS_CXX
@@ -92,7 +92,7 @@ cat $< | sed 's.//.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.g' |
 endef
 
 define COMPILE_F77
-current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F77) $(DEBUG_F77) $(F77FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(basename $(notdir $<)).f 
+current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F77) $(OPTIMISE_F77) $(DEBUG_F77) $(F77FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(basename $(notdir $<)).f 
 endef
 
 define POSTPROCESS_F77
@@ -104,7 +104,7 @@ cat $< | sed 's.//.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.g' |
 endef
 
 define COMPILE_F
-current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F90) $(DEBUG_F90) $(F90FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(basename $(notdir $<)).f  
+current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F90) $(OPTIMISE_F90) $(DEBUG_F90) $(F90FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(basename $(notdir $<)).f  
 endef
 
 define POSTPROCESS_F
@@ -116,7 +116,7 @@ cat $< | sed 's.//.AUTOMATICALLY_GENERATED_CONCATONATION_PROTECTION_STRING.g' |
 endef
 
 define COMPILE_F90
-current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F90) $(DEBUG_F90) $(F90FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(basename $(notdir $<)).f90  
+current_wd=`$(GET_WD)` ; cd $(SCRATCH_BUILD) ; $(F90) $(OPTIMISE_F90) $(DEBUG_F90) $(F90FLAGS) $(FCOMPILEONLY)$(OPTIONSEP)$$current_wd$(DIRSEP)$@ $$current_wd$(DIRSEP)$(basename $(notdir $<)).f90  
 endef
 
 define POSTPROCESS_F90
@@ -145,7 +145,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_C)
-	@echo Compiling $(DEBUG_C) $<
+	@echo Compiling $(OPTIMISE_C) $(DEBUG_C) $<
 	$(COMPILE_C)
 	@echo Postprocessing $<
 	$(POSTPROCESS_C)
@@ -159,7 +159,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_CXX)
-	@echo Compiling $(DEBUG_CXX) $<
+	@echo Compiling $(OPTIMISE_CXX) $(DEBUG_CXX) $<
 	$(COMPILE_CXX)
 	@echo Postprocessing $<
 	$(POSTPROCESS_CXX)
@@ -171,7 +171,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_CXX)
-	@echo Compiling $(DEBUG_CXX) $<
+	@echo Compiling $(OPTIMISE_CXX) $(DEBUG_CXX) $<
 	$(COMPILE_CXX)
 	@echo Postprocessing $<
 	$(POSTPROCESS_CXX)
@@ -184,7 +184,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_CXX)
-	@echo Compiling $(DEBUG_CXX) $<
+	@echo Compiling $(OPTIMISE_CXX) $(DEBUG_CXX) $<
 	$(COMPILE_CXX)
 	@echo Postprocessing $<
 	$(POSTPROCESS_CXX)
@@ -197,7 +197,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_CXX)
-	@echo Compiling $(DEBUG_CXX) $<
+	@echo Compiling $(OPTIMISE_CXX) $(DEBUG_CXX) $<
 	$(COMPILE_CXX)
 	@echo Postprocessing $<
 	$(POSTPROCESS_CXX)
@@ -212,7 +212,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_F77)
-	@echo Compiling $(DEBUG_F77) $<
+	@echo Compiling $(OPTIMISE_F77) $(DEBUG_F77) $<
 	$(COMPILE_F77)
 	@echo Postprocessing $<
 	$(POSTPROCESS_F77)
@@ -221,7 +221,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Copying $<
 	$(PREPROCESS_f77)
-	@echo Compiling $(DEBUG_F77) $<
+	@echo Compiling $(OPTIMISE_F77) $(DEBUG_F77) $<
 	$(COMPILE_F77)
 	@echo Postprocessing $<
 	$(POSTPROCESS_F77)
@@ -238,7 +238,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_F)
-	@echo Compiling $(DEBUG_F90) $<
+	@echo Compiling $(OPTIMISE_F90) $(DEBUG_F90) $<
 	$(COMPILE_F)
 	@echo Postprocessing $<
 	$(POSTPROCESS_F)
@@ -247,7 +247,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Copying $<
 	$(PREPROCESS_f)
-	@echo Compiling $(DEBUG_F90) $<
+	@echo Compiling $(OPTIMISE_F90) $(DEBUG_F90) $<
 	$(COMPILE_F)
 	@echo Postprocessing $<
 	$(POSTPROCESS_F)
@@ -264,7 +264,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Preprocessing $<
 	$(PREPROCESS_F90)
-	@echo Compiling $(DEBUG_F90) $<
+	@echo Compiling $(OPTIMISE_F90) $(DEBUG_F90) $<
 	$(COMPILE_F90)
 	@echo Postprocessing $<
 	$(POSTPROCESS_F90)
@@ -273,7 +273,7 @@ endef
 	@echo $(DIVIDER)
 	@echo Copying $<
 	$(PREPROCESS_f90)
-	@echo Compiling $(DEBUG_F90) $<
+	@echo Compiling $(OPTIMISE_F90) $(DEBUG_F90) $<
 	$(COMPILE_F90)
 	@echo Postprocessing $<
 	$(POSTPROCESS_F90)