From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <binutils-return-38080-listarch-binutils=sources.redhat.com@sources.redhat.com>
Received: (qmail 12404 invoked by alias); 18 Feb 2005 22:59:42 -0000
Mailing-List: contact binutils-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:binutils-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/binutils/>
List-Post: <mailto:binutils@sources.redhat.com>
List-Help: <mailto:binutils-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: binutils-owner@sources.redhat.com
Received: (qmail 12326 invoked from network); 18 Feb 2005 22:59:36 -0000
Received: from unknown (HELO rwcrmhc13.comcast.net) (204.127.198.39)
  by sourceware.org with SMTP; 18 Feb 2005 22:59:36 -0000
Received: from lucon.org ([24.6.212.230]) by comcast.net (rwcrmhc13) with ESMTP
          id <2005021822593601500l5e87e>; Fri, 18 Feb 2005 22:59:36 +0000
Received: by lucon.org (Postfix, from userid 1000)
	id F273765604; Fri, 18 Feb 2005 14:59:35 -0800 (PST)
Date: Mon, 21 Feb 2005 08:37:00 -0000
From: "H. J. Lu" <hjl@lucon.org>
To: binutils@sources.redhat.com
Subject: PATCH: Test the just built windres/dlltool only
Message-ID: <20050218225935.GA30688@lucon.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
X-SW-Source: 2005-02/txt/msg00452.txt.bz2

windres/dlltool may not be built for all platforms. But we are picking
up them from PATH even if they weren't built at all. This patch
changes it.


H.J.
----
2005-02-18  H.J. Lu  <hongjiu.lu@intel.com>

	* config/default.exp: Set WINDRES only if windres is built. Set
	DLLTOOL only if dlltool is built.

--- binutils/testsuite/config/default.exp.win	2004-11-05 14:41:25.000000000 -0800
+++ binutils/testsuite/config/default.exp	2005-02-18 14:30:17.384437504 -0800
@@ -62,11 +62,11 @@ if ![info exists READELF] then {
 if ![info exists READELFFLAGS] then {
     set READELFFLAGS ""
 }
-if ![info exists WINDRES] then {
-    set WINDRES [findfile $base_dir/windres]
+if {![info exists WINDRES] && [file exists $base_dir/windres]} then {
+    set WINDRES $base_dir/windres
 }
-if ![info exists DLLTOOL] then {
-    set DLLTOOL [findfile $base_dir/dlltool]
+if {![info exists DLLTOOL] && [file exists $base_dir/dlltool] } then {
+    set DLLTOOL $base_dir/dlltool
 }
 
 if ![file isdirectory tmpdir] {catch "exec mkdir tmpdir" status}