From 9a082684dfe6a5473f7f0bc4ec7373c01153aff7 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Fri, 2 Jul 2010 08:56:04 +0000 Subject: [PATCH] fix darwin8 bootstrap issue * compare-debug (Darwin): Remove '-x' flag from ld-based object stripping. Add a comment as to why we do it this way. From-SVN: r161686 --- contrib/ChangeLog | 5 +++++ contrib/compare-debug | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 12271531ddf..414e31e8ca6 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2010-07-02 Iain Sandoe + + * compare-debug (Darwin): Remove '-x' flag from ld-based object + stripping. Add a comment as to why we do it this way. + 2010-06-20 Alexandre Oliva * compare-debug: Drop LTO sections. diff --git a/contrib/compare-debug b/contrib/compare-debug index 820721cd971..ea68b437db0 100755 --- a/contrib/compare-debug +++ b/contrib/compare-debug @@ -59,8 +59,10 @@ trap 'rm -f "$1.$suf1" "$2.$suf2"' 0 1 2 15 case `uname -s` in Darwin) - ld -S -x -r -no_uuid "$1" -o "$1.$suf1" - ld -S -x -r -no_uuid "$2" -o "$2.$suf2" + # The strip command on darwin does not remove all debug info. + # Fortunately, we can use ld to do it instead. + ld -S -r -no_uuid "$1" -o "$1.$suf1" + ld -S -r -no_uuid "$2" -o "$2.$suf2" ;; *) cp "$1" "$1.$suf1"