blob: 3cd14435f9738813b0457d5b2221ecb5f3ff288f (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
diff --git a/miniapps/common/makefile b/miniapps/common/makefile
index 12506bf8b..681d9e83c 100644
--- a/miniapps/common/makefile
+++ b/miniapps/common/makefile
@@ -31,10 +31,12 @@ MFEM_LIB_FILE = mfem_is_not_built
ifneq (clean,$(MAKECMDGOALS))
-include $(CONFIG_MK)
- ifeq ($(MFEM_USE_CUDA)$(MFEM_USE_HIP),NONO)
- XLINKER = $(CXX_XLINKER)
- else ifeq ($(MFEM_USE_CUDA),YES)
+ ifeq ($(MFEM_USE_CUDA),YES)
XLINKER = $(CUDA_XLINKER)
+ else ifeq ($(MFEM_USE_HIP),YES)
+ XLINKER = $(HIP_XLINKER)
+ else
+ XLINKER = $(CXX_XLINKER)
endif
BUILD_REAL_DIR = $(realpath .)
diff --git a/miniapps/hooke/makefile b/miniapps/hooke/makefile
index 7687a7eb3..6c5c2b24d 100644
--- a/miniapps/hooke/makefile
+++ b/miniapps/hooke/makefile
@@ -29,6 +29,11 @@ HOOKE_OBJ = $(HOOKE_SRC:.cpp=.o)
SEQ_MINIAPPS =
PAR_MINIAPPS = hooke
+# The hooke miniapp crashes the AMD HIP compiler, so for now we disable it
+# when HIP is enabled:
+ifeq ($(MFEM_USE_HIP),YES)
+ PAR_MINIAPPS =
+endif
ifeq ($(MFEM_USE_MPI),NO)
MINIAPPS = $(SEQ_MINIAPPS)
else
|
