[cig-commits] [commit] QA: build: Fix rules for xmodel_update. (aff4543)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Jan 20 07:11:42 PST 2014
Repository : ssh://geoshell/specfem3d
On branch : QA
Link : https://github.com/geodynamics/specfem3d/compare/4359ed56c14ef8f87387f46c8b705a1d395a40ba...8e7fca259d3e520c105549cfacfb92b6c83f8971
>---------------------------------------------------------------
commit aff454326ccbfddbfc4bc04c9bb3c211f9ed60f7
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sat Jan 18 02:51:51 2014 -0500
build: Fix rules for xmodel_update.
Missing some options for the include directory and linking with the
ADIOS libraries.
>---------------------------------------------------------------
aff454326ccbfddbfc4bc04c9bb3c211f9ed60f7
src/specfem3D/Makefile.in | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/specfem3D/Makefile.in b/src/specfem3D/Makefile.in
index 8554e53..497801a 100644
--- a/src/specfem3D/Makefile.in
+++ b/src/specfem3D/Makefile.in
@@ -321,8 +321,7 @@ ADIOS_INC = @ADIOS_FCFLAGS@ -I../../
ADIOS_LINK = @ADIOS_LIBS@
#@COND_ADIOS_TRUE at CPPFLAGS = @CPPFLAGS@
- at COND_ADIOS_TRUE@MPIFCCOMPILE_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(ADIOS_INC) $(FLAGS_CHECK)
- at COND_ADIOS_TRUE@MPIFCCOMPILE_NO_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(ADIOS_INC) $(FLAGS_NO_CHECK)
+ at COND_ADIOS_TRUE@MPIFCCOMPILE_CHECK =@FCENV@ ${MPIFC} ${FCFLAGS} $(ADIOS_INC) $(FLAGS_CHECK) $(COND_OPENMP_FFLAGS) -I$(SHARED)
# objects toggled between the parallel and serial version
@COND_MPI_TRUE at COND_MPI_OBJECTS = $O/parallel.o
@@ -412,7 +411,7 @@ $E/xsum_kernels: $(SUM_KERNELS_OBJECTS) $(COND_MPI_OBJECTS)
${FCLINK} -o ${E}/xsum_kernels $(SUM_KERNELS_OBJECTS) $(COND_MPI_OBJECTS) $(MPILIBS)
$E/xmodel_update: $(ADIOS_PREOBJECTS) $(MODEL_UPD_OBJECTS) $(COND_MPI_OBJECTS) $(CUDA_STUBS)
- ${FCLINK} -o ${E}/xmodel_update $(ADIOS_OBJECTS) $(MODEL_UPD_OBJECTS) $(ADIOS_PREOBJECTS) $(COND_MPI_OBJECTS) $(MPILIBS) $(CUDA_STUBS)
+ ${FCLINK} -o ${E}/xmodel_update $(ADIOS_OBJECTS) $(MODEL_UPD_OBJECTS) $(ADIOS_PREOBJECTS) $(COND_MPI_OBJECTS) $(MPILIBS) $(CUDA_STUBS) $(ADIOS_LINK) $(LDFLAGS)
clean:
rm -f $O/* *.gnu *.mod \
More information about the CIG-COMMITS
mailing list