Commit 146343ce authored by Thomas Jahns's avatar Thomas Jahns 🤸
Browse files

Fix oversight.

parent d33a81ab
......@@ -52,7 +52,7 @@ cdi_FCFLAGS="${FCFLAGS} -Wl,-Wl,,-rpath,,${eccodes_root}/lib64 ${netcdf_fortran_
if [[ ${libtype-shared} = static ]]; then
# only a statically built ppm can link to the static netcdf_fortran
# currently used
ppm_configure="'FCFLAGS=$FCFLAGS ${netcdf_fortran_LIBS_FC[*]} -wmismatch=ppm_hex_checksum_f,mpi_allgather,mpi_allgatherv,mpi_allreduce,mpi_bcast,ppm_qsort_r,ppm_insertion_sort_once,ppm_heap_elem_increase_sort,ppm_heapify,ppm_heap_leaf_minimize,mpi_sendrecv,ppm_get_address,ppm_dist_mult_array_get_f2c' 'LIBS=${netcdf_fortran_LIBS[@]}'"
ppm_configure="'FCFLAGS=$FCFLAGS ${netcdf_fortran_LIBS_FC[*]} -wmismatch=ppm_hex_checksum_f,mpi_allgather,mpi_allgatherv,mpi_allreduce,mpi_bcast,ppm_qsort_r,ppm_insertion_sort_once,ppm_heap_elem_increase_sort,ppm_heapify,ppm_heap_leaf_minimize,mpi_sendrecv,ppm_get_address,ppm_dist_mult_array_get_f2c' 'LIBS=${netcdf_fortran_LIBS[*]}'"
else
ppm_configure="'FCFLAGS=$FCFLAGS -wmismatch=ppm_hex_checksum_f,mpi_allgather,mpi_allgatherv,mpi_allreduce,mpi_bcast,ppm_qsort_r,ppm_insertion_sort_once,ppm_heap_elem_increase_sort,ppm_heapify,ppm_heap_leaf_minimize,mpi_sendrecv,ppm_get_address,ppm_dist_mult_array_get_f2c'"
fi
......@@ -67,7 +67,7 @@ ${scriptdir}build-cdi-pio-stack.sh \
CFLAGS="$CFLAGS" \
FCFLAGS="$FCFLAGS" \
LDFLAGS="-L${eccodes_root}/lib64" \
ppm_configure="" \
ppm_configure="$ppm_configure" \
cdi_configure="'LIBS=$cdi_LIBS' 'FCFLAGS=$cdi_FCFLAGS' 'FFLAGS=$cdi_FCFLAGS' 'CFLAGS=${CFLAGS} -Wl,-rpath,${eccodes_root}/lib64 ${netcdf_fortran_LIBS_CC[*]}'" \
SCRATCH="$SCRATCH" \
--use-from-system libaec \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment