Merge
authoramurillo
Thu, 28 May 2015 11:37:13 -0700
changeset 30854 fbeaa07bbb1f
parent 30742 679fecf08dd2 (current diff)
parent 30853 0384273d840d (diff)
child 30855 6d183034f9fa
child 31011 74f74963b502
Merge
--- a/make/StripBinaries.gmk	Wed May 27 13:25:04 2015 -0700
+++ b/make/StripBinaries.gmk	Thu May 28 11:37:13 2015 -0700
@@ -61,9 +61,12 @@
 COPY_LIBS_SRC := \
     $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/modules_libs \
         \( ! -name '*$(SHARED_LIBRARY_SUFFIX)' -type f \) -o -type l)
+# OS X stores symbol information in a .dylib file inside a .dSYM directory -
+# that file should not be stripped, so we prune the tree at the .dSYM directory.
+# Example: support/modules_libs/java.base/libjsig.dylib.dSYM/Contents/Resources/DWARF/libjsig.dylib
 STRIP_LIBS_SRC := \
     $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/modules_libs \
-        -name '*$(SHARED_LIBRARY_SUFFIX)' -type f)
+        -name '*$(SHARED_LIBRARY_SUFFIX)' -type f -print -o -name "*.dSYM" -prune)
 
 $(eval $(call SetupCopyFiles,STRIP_MODULES_CMDS, \
     SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds, \