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

Commit 14ad572

Browse files
pramodkiomaganaris
andauthored
Do not remove <arch>/.libs but only coreneuron mechanism libray (#497)
* Do not remove <arch>/.libs but only coreneuron libray - coreneuron mechanism lib is <arch>/.libs/libcorenrnmech* - fix symlink * Also update test to run nrnivmodl-core first and then nrnivmodl Co-authored-by: Ioannis Magkanaris <[email protected]>
1 parent 523ef4f commit 14ad572

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

extra/nrnivmodl_core_makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,9 @@ $(SPECIAL_EXE): coremech_lib_target
187187
-Wl,-rpath,'$(LIB_RPATH)' -Wl,-rpath,$(CORENRN_LIB_DIR)
188188

189189
coremech_lib_target: $(corenrnmech_lib_target)
190-
rm -rf $(OUTPUT_DIR)/.libs; \
190+
rm -rf $(OUTPUT_DIR)/.libs/lib$(COREMECH_LIB_NAME)$(LIB_SUFFIX); \
191191
mkdir -p $(OUTPUT_DIR)/.libs; \
192-
ln -s ${COREMECH_LIB_PATH} $(OUTPUT_DIR)/.libs/libcorenrnmech$(LIB_SUFFIX)
192+
ln -s ../lib$(COREMECH_LIB_NAME)$(LIB_SUFFIX) $(OUTPUT_DIR)/.libs/lib$(COREMECH_LIB_NAME)$(LIB_SUFFIX)
193193

194194
$(ENGINEMECH_OBJ): | $(MOD_OBJS_DIR)
195195
$(CXX_COMPILE_CMD) -c -DADDITIONAL_MECHS $(CORENRN_SHARE_CORENRN_DIR)/enginemech.cpp -o $(ENGINEMECH_OBJ)

tests/jenkins/run_neuron_direct.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ build_dir=$(mktemp -d $(pwd)/build_XXXX)
1414
cd $build_dir
1515

1616
# build special and special-core
17-
nrnivmodl-core ../tests/jenkins/mod
1817
nrnivmodl ../tests/jenkins/mod
18+
nrnivmodl-core ../tests/jenkins/mod
1919
ls -la x86_64
2020

2121
# Unload intel module to avoid issue whith mpirun

0 commit comments

Comments
 (0)