From e4976006576357505914f995f0220214dda25598 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 2 Oct 2015 23:45:21 +0200 Subject: [PATCH] ignore the lib stripping errors that seem to occure on Mac OSX --- tools/cmake/Java.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake index 333e2c66e1..fdf7ad46ad 100644 --- a/tools/cmake/Java.cmake +++ b/tools/cmake/Java.cmake @@ -121,9 +121,12 @@ if(enable_lib_in_jar) COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO} ${JAVA_NATIVE_PATH} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_JAVA_SO} ${JAVA_NATIVE_PATH} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/${LIBSURF_JAVA_SO} ${JAVA_NATIVE_PATH} - COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO} - COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO} - COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSURF_JAVA_SO} + + # strip seems to fail on Mac on binaries that are already stripped. + # It then spits: "symbols referenced by indirect symbol table entries that can't be stripped" + COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_SO} || true + COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSIMGRID_JAVA_SO} || true + COMMAND ${STRIP_COMMAND} ${JAVA_NATIVE_PATH}/${LIBSURF_JAVA_SO} || true COMMAND ${JAVA_ARCHIVE} -uvf ${SIMGRID_JAR} NATIVE COMMAND ${CMAKE_COMMAND} -E remove_directory NATIVE -- 2.20.1