Skip to content

Commit

Permalink
Account for missing XIAR.
Browse files Browse the repository at this point in the history
  • Loading branch information
hfp committed Jul 25, 2024
1 parent d554cbc commit b0d4bd8
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions config/cp2k/Linux-x86-64-intelx.arch
Original file line number Diff line number Diff line change
Expand Up @@ -176,16 +176,22 @@ ifneq (0,$(MPI))
endif
ifeq (0,$(GNU))
ifeq (1,$(INTEL)) # fallback to next-gen in case of C/C++
RANLIB := xiar -s
AR := xiar -r
CXX := mpiicpc $(if $(call which,icpc),$(NULL),-cxx=icpx)
CC := mpiicc $(if $(call which,icc),$(NULL),-cc=icx)
FC := mpiifort
LD := mpiifort
else ifneq (,$(call which,mpiifx))
#RANLIB := ar -s
#AR := ar -r
CXX := mpiicpx
CC := mpiicx
FC := mpiifx
LD := mpiifx
else
RANLIB := xiar -s
AR := xiar -r
CXX := mpiicpc -cxx=icpx
CC := mpiicc -cc=icx
FC := mpiifort -fc=ifx
Expand All @@ -199,11 +205,15 @@ ifneq (0,$(MPI))
endif
else ifeq (0,$(GNU))
ifeq (1,$(INTEL)) # fallback to next-gen in case of C/C++
RANLIB := xiar -s
AR := xiar -r
CXX := $(if $(call which,icpc),icpc,icpx)
CC := $(if $(call which,icc),icc,icx)
FC := ifort
LD := ifort
else
#RANLIB := ar -s
#AR := ar -r
CXX := icpx
CC := icx
FC := ifx
Expand Down Expand Up @@ -494,8 +504,6 @@ ifeq (0,$(GNU)) # Intel
endif
MKL_OMPRTL := intel
MKL_FCRTL := intel
RANLIB := xiar -s
AR := xiar -r
else # GNU GCC
ifeq (,$(MKLROOT))
$(info ================================================================================)
Expand Down

0 comments on commit b0d4bd8

Please sign in to comment.