Fixing up rpath libstdc++ for all versions

Change-Id: Ic67b18f27ebeb0a6bdfd67c75f12e6bb4626c944
This commit is contained in:
Patrick Plenefisch
2015-10-04 18:21:57 -04:00
parent 9c1ab69871
commit c384fc97d5
3 changed files with 3 additions and 3 deletions

View File

@@ -173,7 +173,7 @@ enableIn10Seconds&
RUN_COMMAND=none
if [[ ${LANGUAGE} = java ]]; then
chmod a+x ${DEFAULT_JAVA_TEST_NAME}
RUN_COMMAND="${DEFAULT_PATH_TO_JRE} -ea -jar ${DEFAULT_JAVA_TEST_NAME} ${TEST_RUN_ARGS}"
RUN_COMMAND="env LD_LIBRARY_PATH=/usr/local/frc/rpath-lib/ ${DEFAULT_PATH_TO_JRE} -ea -jar ${DEFAULT_JAVA_TEST_NAME} ${TEST_RUN_ARGS}"
elif [[ ${LANGUAGE} = cpp ]]; then
chmod a+x ${DEFAULT_CPP_TEST_NAME}
RUN_COMMAND="./${DEFAULT_CPP_TEST_NAME} ${TEST_RUN_ARGS}"