diff options
| author | rhaas <rhaas@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2012-07-08 21:20:09 +0000 |
|---|---|---|
| committer | rhaas <rhaas@c83d129a-5a75-4d5a-9c4d-ed3a5855bf45> | 2012-07-08 21:20:09 +0000 |
| commit | 73bef744c5f178e180ccee19058b6db37ede5a5d (patch) | |
| tree | 72cfacf82a318891345def6f3e46107e05078ff5 /src/make.configuration.deps | |
| parent | 1f0e2374cf8c91307bc41035cffc77717ff31d7e (diff) | |
GRHydro: remove OpenMP options from Riemann1D build
to maek it compiel on Kraken without specifying -openmp to the linker
and complaining about ifcore vs ifcoremt issues
sort object file before library files for static linkage avoid compiler
warning about using libm math rather than mkl math
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@390 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45
Diffstat (limited to 'src/make.configuration.deps')
| -rw-r--r-- | src/make.configuration.deps | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/make.configuration.deps b/src/make.configuration.deps index f8626b9..1533d64 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -8,11 +8,11 @@ endif $(UTIL_DIR)$(DIRSEP)%: $(BUILD_DIR)$(DIRSEP)GRHydro$(DIRSEP)%.o @echo Creating $* in $(UTIL_DIR) from $< if [ ! -d $(UTIL_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) ; fi - $(F90) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $(GENERAL_LIBRARIES) -lstdc++ $< + $(F90) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $< $(GENERAL_LIBRARIES) $(BUILD_DIR)$(DIRSEP)GRHydro$(DIRSEP)%.o: $(PACKAGE_DIR)$(DIRSEP)EinsteinEvolve$(DIRSEP)GRHydro$(DIRSEP)src$(DIRSEP)util$(DIRSEP)%.f90 @echo Compiling $< if [ ! -d $(BUILD_DIR)$(DIRSEP)GRHydro ]; then $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)$(DIRSEP)GRHydro ; fi cd $(BUILD_DIR)$(DIRSEP)GRHydro - $(F90) $< $(F90FLAGS) -I$(CONFIG) -I$(BINDINGS_DIR)$(DIRSEP)include -I$(FLESH_DIR)$(DIRSEP)include -I$(CCTK_HOME)$(DIRSEP)arrangements $(SYS_INC_DIRS:%=-I%) $(FCOMPILEONLY)$(OPTIONSEP)$@ + $(F90) $< $(filter-out $(F90_OPENMP_FLAGS),$(F90FLAGS)) -I$(CONFIG) -I$(BINDINGS_DIR)$(DIRSEP)include -I$(FLESH_DIR)$(DIRSEP)include -I$(CCTK_HOME)$(DIRSEP)arrangements $(SYS_INC_DIRS:%=-I%) $(FCOMPILEONLY)$(OPTIONSEP)$@ |