Skip to content

Commit 6787493

Browse files
committed
FDS Build: Remove commented lines
1 parent a0d904b commit 6787493

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Build/makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ FFLAGSMKL =
5555
LFLAGSMKL_INTEL =
5656
LFLAGSMKL_INTEL_OPENMP =
5757
LFLAGSMKL_GNU_OPENMP =
58+
LFLAGSMKL_OMPI_INTEL_LINUX =
5859
LFLAGSMKL_CUSTOM =
5960
LFLAGSMKL_CUSTOM_OPENMP =
6061

@@ -80,18 +81,16 @@ $(info MKLLIBDIR = $(MKLLIBDIR))
8081

8182
ifeq ($(shell echo "check_quotes"),"check_quotes")
8283
# windows
83-
#MKLLIBDIR = $(MKLROOT)\lib
8484
FFLAGSMKL = -DWITH_MKL /I"$(MKLROOT)\include"
8585
COMMON_MKL_LIBS = "$(MKLLIBDIR)\mkl_intel_lp64.lib" "$(MKLLIBDIR)\mkl_core.lib" "$(MKLLIBDIR)\mkl_blacs_intelmpi_lp64.lib"
8686
LFLAGSMKL_INTEL = $(COMMON_MKL_LIBS) "$(MKLLIBDIR)\mkl_sequential.lib"
8787
LFLAGSMKL_INTEL_OPENMP = $(COMMON_MKL_LIBS) "$(MKLLIBDIR)\mkl_intel_thread.lib"
8888
else
8989
# linux
90-
#MKLLIBDIR = $(MKLROOT)/lib
9190
FFLAGSMKL = -DWITH_MKL -I$(MKLROOT)/include
91+
COMMON_MKL_LIBS = ${MKLLIBDIR}/libmkl_intel_lp64.a ${MKLLIBDIR}/libmkl_core.a -lpthread -lm -ldl
9292

9393
# impi_intel_linux targets
94-
COMMON_MKL_LIBS = ${MKLLIBDIR}/libmkl_intel_lp64.a ${MKLLIBDIR}/libmkl_core.a -lpthread -lm -ldl
9594
COMMON_MKL_INTEL_LIBS = ${COMMON_MKL_LIBS} ${MKLLIBDIR}/libmkl_blacs_intelmpi_lp64.a
9695
LFLAGSMKL_INTEL = -Wl,--start-group ${COMMON_MKL_INTEL_LIBS} ${MKLLIBDIR}/libmkl_sequential.a -Wl,--end-group
9796
LFLAGSMKL_INTEL_OPENMP = -Wl,--start-group ${COMMON_MKL_INTEL_LIBS} ${MKLLIBDIR}/libmkl_intel_thread.a -liomp5 -Wl,--end-group

0 commit comments

Comments
 (0)