Skip to content

Commit

Permalink
Remove LD_PRELOAD from profile scripts.
Browse files Browse the repository at this point in the history
Tcmalloc causes emacs to crash so don't pollute the standard environment
with it.
Refs #10271
  • Loading branch information
martyngigg committed Nov 26, 2014
1 parent 50ddf1f commit b6cf1ac
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions Code/Mantid/Build/CMake/LinuxPackageScripts.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,8 @@ file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/mantid.sh
"PV_PLUGIN_PATH=${CMAKE_INSTALL_PREFIX}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR}\n"
"PATH=$PATH:$MANTIDPATH\n"
"PYTHONPATH=$MANTIDPATH:$PYTHONPATH\n"
"LD_PRELOAD=${EXTRA_LDPRELOAD_LIBS}:\${LD_PRELOAD}\n"
"if [ -z \"\${TCMALLOC_RELEASE_RATE}\" ]; then\n"
" TCMALLOC_RELEASE_RATE=10000\n"
" export TCMALLOC_RELEASE_RATE\n"
"fi\n"

"export MANTIDPATH PV_PLUGIN_PATH PATH PYTHONPATH LD_PRELOAD\n"
"export MANTIDPATH PV_PLUGIN_PATH PATH PYTHONPATH\n"
)

# c-shell
Expand All @@ -52,10 +47,7 @@ file ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/mantid.csh
"setenv MANTIDPATH \"${CMAKE_INSTALL_PREFIX}/${BIN_DIR}\"\n"
"setenv PV_PLUGIN_PATH \"${CMAKE_INSTALL_PREFIX}/${PVPLUGINS_DIR}/${PVPLUGINS_DIR}\"\n"
"setenv PATH \"\${PATH}:\${MANTIDPATH}\"\n"
"set LD_PRELOAD \"${EXTRA_LDPRELOAD_LIBS}:\${LD_PRELOAD}\"\n"
"if ($?TCMALLOC_RELEASE_RATE) then\n"
" setenv TCMALLOC_RELEASE_RATE 10000\n"
"endif\n"

"if ($?PYTHONPATH) then\n"
" setenv PYTHONPATH \"\${MANTIDPATH}:\${PYTHONPATH}\"\n"
"else\n"
Expand Down

0 comments on commit b6cf1ac

Please sign in to comment.