svn: /php/php-src/ branches/PHP_5_2/ltmain.sh branches/PHP_5_3/ltmain.sh trunk/ltmain.sh

From: Date: Mon, 23 Nov 2009 16:51:45 +0000
Subject: svn: /php/php-src/ branches/PHP_5_2/ltmain.sh branches/PHP_5_3/ltmain.sh trunk/ltmain.sh
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-60981@lists.php.net to get a copy of this message
rasmus Mon, 23 Nov 2009 16:51:45 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=291216 Log: Don't try to remove an empty output_obj here. This gets rid of the annoying: rm: invalid argument: `' I was seeing. (I really shouldn't be hacking libtool) Changed paths: U php/php-src/branches/PHP_5_2/ltmain.sh U php/php-src/branches/PHP_5_3/ltmain.sh U php/php-src/trunk/ltmain.sh Modified: php/php-src/branches/PHP_5_2/ltmain.sh =================================================================== --- php/php-src/branches/PHP_5_2/ltmain.sh 2009-11-23 15:45:04 UTC (rev 291215) +++ php/php-src/branches/PHP_5_2/ltmain.sh 2009-11-23 16:51:45 UTC (rev 291216) @@ -863,12 +863,13 @@ fi if test -z "$output_obj"; then + $run $rm "$lobj" # Place PIC objects in $objdir command="$command -o $lobj" + else + $run $rm "$lobj" "$output_obj" fi - $run $rm "$lobj" "$output_obj" - $show "$command" if $run eval "$command"; then : else Modified: php/php-src/branches/PHP_5_3/ltmain.sh =================================================================== --- php/php-src/branches/PHP_5_3/ltmain.sh 2009-11-23 15:45:04 UTC (rev 291215) +++ php/php-src/branches/PHP_5_3/ltmain.sh 2009-11-23 16:51:45 UTC (rev 291216) @@ -863,12 +863,13 @@ fi if test -z "$output_obj"; then + $run $rm "$lobj" # Place PIC objects in $objdir command="$command -o $lobj" + else + $run $rm "$lobj" "$output_obj" fi - $run $rm "$lobj" "$output_obj" - $show "$command" if $run eval "$command"; then : else Modified: php/php-src/trunk/ltmain.sh =================================================================== --- php/php-src/trunk/ltmain.sh 2009-11-23 15:45:04 UTC (rev 291215) +++ php/php-src/trunk/ltmain.sh 2009-11-23 16:51:45 UTC (rev 291216) @@ -863,12 +863,13 @@ fi if test -z "$output_obj"; then + $run $rm "$lobj" # Place PIC objects in $objdir command="$command -o $lobj" + else + $run $rm "$lobj" "$output_obj" fi - $run $rm "$lobj" "$output_obj" - $show "$command" if $run eval "$command"; then : else

« previous php.cvs (#60981) next »