Skip to content
Snippets Groups Projects
Commit 1b2552f1 authored by Wayne Lewis's avatar Wayne Lewis
Browse files

Merge branch 'ld_path' into 'master'

Removed siteLibs/T_A from LD_LIBRARY_PATH

See merge request e3/e3-require!25
parents be897376 fa02cdb7
No related branches found
No related tags found
No related merge requests found
......@@ -165,11 +165,8 @@ if [ -n "$EPICS_BASE" ]; then
e3_ld_path=${LD_LIBRARY_PATH}
drop_e3_ld_path1="${E3_REQUIRE_LIB}/${EPICS_HOST_ARCH}"
drop_e3_ld_path2="${E3_SITELIBS_PATH}/${EPICS_HOST_ARCH}"
e3_ld_path_0=$(drop_from_path "${e3_ld_path}" "${drop_e3_ld_path1}")
LD_LIBRARY_PATH=$(drop_from_path "${e3_ld_path_0}" "${drop_e3_ld_path2}")
drop_e3_ld_path="${E3_REQUIRE_LIB}/${EPICS_HOST_ARCH}"
LD_LIBRARY_PATH=$(drop_from_path "${e3_ld_path}" "${drop_e3_ld_path}")
export LD_LIBRARY_PATH
unset E3_REQUIRE_NAME
......@@ -350,7 +347,7 @@ PATH=$(set_variable "${old_path}" "${E3_PATH}")
export PATH
old_ld_path=${LD_LIBRARY_PATH}
E3_LD_LIBRARY_PATH="${EPICS_BASE}/lib/${EPICS_HOST_ARCH}:${E3_REQUIRE_LIB}/${EPICS_HOST_ARCH}:${E3_SITELIBS_PATH}/${EPICS_HOST_ARCH}"
E3_LD_LIBRARY_PATH="${EPICS_BASE}/lib/${EPICS_HOST_ARCH}:${E3_REQUIRE_LIB}/${EPICS_HOST_ARCH}"
LD_LIBRARY_PATH=$(set_variable "${old_ld_path}" "${E3_LD_LIBRARY_PATH}")
export LD_LIBRARY_PATH
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment