[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: darwin fat archive support
From: |
Albert Chin |
Subject: |
Re: darwin fat archive support |
Date: |
Thu, 22 Jul 2004 13:37:55 -0500 |
User-agent: |
Mutt/1.5.6i |
On Thu, Jul 22, 2004 at 11:04:38PM +0900, Peter O'Gorman wrote:
> Index: ltmain.in
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/ltmain.in,v
> retrieving revision 1.401
> diff -u -3 -p -u -r1.401 ltmain.in
> --- ltmain.in 20 Jul 2004 14:53:11 -0000 1.401
> +++ ltmain.in 22 Jul 2004 13:34:10 -0000
> @@ -517,42 +517,45 @@ func_extract_archives () {
> fi
> case $host in
> *-darwin*)
> - darwin_orig_dir=`pwd`
> - $show "cd $my_xdir"
> - $run eval "cd \$my_xdir" || exit $?
> - darwin_archive=$my_xabs
> - darwin_curdir=`pwd`
> - darwin_base_archive=`basename $darwin_archive`
> - darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | grep
> Architectures 2>/dev/null`
> - if test -n "$darwin_arches"; then
> - darwin_arches=`echo "$darwin_arches" | sed -e 's/.*are://'`
> - darwin_arch=
> - for darwin_arch in $darwin_arches ; do
> - mkdir -p ./unfat-$$/${darwin_base_archive}-${darwin_arch}
> - lipo -thin $darwin_arch -output
> unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}
> ${darwin_archive}
> - # Remove the table of contents from the thin files.
> - $run eval "$AR -d
> unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}
> __.SYMDEF 2>/dev/null|| true"
> - $run eval "$AR -d
> unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}
> __.SYMDEF\ SORTED 2>/dev/null|| true"
> - cd unfat-$$/${darwin_base_archive}-${darwin_arch}
> - $run eval "$AR -xo ${darwin_base_archive}"
> - $run eval "rm ${darwin_base_archive}"
> - cd $darwin_curdir
> - done
> + $show "Extracting $my_xabs"
> + # Do not bother doing anything if just a dry run
> + if test -z "$run"; then
> + darwin_orig_dir=`pwd`
> + cd $my_xdir || exit $?
> + darwin_archive=$my_xabs
> + darwin_curdir=`pwd`
> + darwin_base_archive=`basename $darwin_archive`
> + darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $GREP
> Architectures 2>/dev/null`
> + if test -n "$darwin_arches"; then
> + darwin_arches=`echo "$darwin_arches" | sed -e 's/.*are://'`
> + darwin_arch=
> + $show "$darwin_base_archive has multiple architectures
> $darwin_arches"
$show "$darwin_base_archive has multiple architectures:
$darwin_arches"
^
> + for darwin_arch in $darwin_arches ; do
^^?
--
albert chin (address@hidden)