Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Commit ddc7ebc

Browse files
committed
fix ISPC build issue and nrnivmodl-core failure on OSX
1 parent 31e116d commit ddc7ebc

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

extra/nrnivmodl_core_makefile.in

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ OUTPUT_DIR = @CMAKE_HOST_SYSTEM_PROCESSOR@
1515
DESTDIR =
1616
TARGET_LIB_TYPE = $(BUILD_TYPE)
1717

18+
# required for OSX to execute nrnivmodl-core
19+
OSX_SYSROOT=@CMAKE_OSX_SYSROOT@
20+
ifneq ($(OSX_SYSROOT),)
21+
export SDKROOT := $(OSX_SYSROOT)
22+
endif
23+
1824
# CoreNEURON installation directories
1925
CORENRN_BIN_DIR := $(ROOT)/bin
2026
CORENRN_LIB_DIR := $(ROOT)/lib
@@ -64,11 +70,11 @@ MOD2CPP_ENV_VAR = PYTHONPATH=@CORENRN_NMODL_PYTHONPATH@:${CORENRN_LIB_DIR}/pytho
6470
# nmodl options
6571
ifeq (@CORENRN_ENABLE_NMODL@, ON)
6672
ifeq (@CORENRN_ENABLE_GPU@, ON)
67-
nmodl_arguments_c="@NMODL_ACC_BACKEND_ARGS@ @NMODL_COMMON_ARGS@"
73+
nmodl_arguments_c=@NMODL_ACC_BACKEND_ARGS@ @NMODL_COMMON_ARGS@
6874
else
69-
nmodl_arguments_c="@NMODL_CPU_BACKEND_ARGS@ @NMODL_COMMON_ARGS@"
75+
nmodl_arguments_c=@NMODL_CPU_BACKEND_ARGS@ @NMODL_COMMON_ARGS@
7076
endif
71-
nmodl_arguments_ispc="@NMODL_ISPC_BACKEND_ARGS@ @NMODL_COMMON_ARGS@"
77+
nmodl_arguments_ispc=@NMODL_ISPC_BACKEND_ARGS@ @NMODL_COMMON_ARGS@
7278
endif
7379

7480
# name of the mechanism library with suffix if provided
@@ -155,8 +161,8 @@ C_GREEN := \033[32m
155161

156162
# Default nmodl flags. Override if MOD2CPP_RUNTIME_FLAGS is not empty
157163
ifeq (@CORENRN_ENABLE_NMODL@, ON)
158-
MOD2CPP_FLAGS_ISPC = $(if $(MOD2CPP_RUNTIME_FLAGS),$(MOD2CPP_RUNTIME_FLAGS),@nmodl_arguments_ispc@)
159-
MOD2CPP_FLAGS_C = $(if $(MOD2CPP_RUNTIME_FLAGS),$(MOD2CPP_RUNTIME_FLAGS),@nmodl_arguments_c@)
164+
MOD2CPP_FLAGS_ISPC = $(if $(MOD2CPP_RUNTIME_FLAGS),$(MOD2CPP_RUNTIME_FLAGS),$(nmodl_arguments_ispc))
165+
MOD2CPP_FLAGS_C = $(if $(MOD2CPP_RUNTIME_FLAGS),$(MOD2CPP_RUNTIME_FLAGS),$(nmodl_arguments_c))
160166
endif
161167

162168
ifeq (@CORENRN_ENABLE_ISPC@, ON)

0 commit comments

Comments
 (0)