From patchwork Wed Jul 20 06:19:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yaakov (Cygwin/X)" X-Patchwork-Id: 105586 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 40BBDB6F75 for ; Wed, 20 Jul 2011 16:20:03 +1000 (EST) Received: (qmail 17747 invoked by alias); 20 Jul 2011 06:20:01 -0000 Received: (qmail 17735 invoked by uid 22791); 20 Jul 2011 06:19:59 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-gw0-f47.google.com (HELO mail-gw0-f47.google.com) (74.125.83.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 20 Jul 2011 06:19:36 +0000 Received: by gwb11 with SMTP id 11so387199gwb.20 for ; Tue, 19 Jul 2011 23:19:35 -0700 (PDT) Received: by 10.101.163.19 with SMTP id q19mr7442832ano.82.1311142775656; Tue, 19 Jul 2011 23:19:35 -0700 (PDT) Received: from [127.0.0.1] (S0106000cf16f58b1.wp.shawcable.net [174.5.115.130]) by mx.google.com with ESMTPS id i33sm575858anm.24.2011.07.19.23.19.33 (version=SSLv3 cipher=OTHER); Tue, 19 Jul 2011 23:19:35 -0700 (PDT) Subject: [PATCH] fix config.rpath for cygwin/mingw From: "Yaakov (Cygwin/X)" To: gcc-patches@gcc.gnu.org, binutils@sourceware.org Date: Wed, 20 Jul 2011 01:19:41 -0500 Message-ID: <1311142784.7796.35.camel@YAAKOV04> Mime-Version: 1.0 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org The gettext macros use config.rpath to determine the link library name of libiconv and libintl (on non-glibc platforms); the import library suffix is of importance, not the runtime library suffix. On PE platforms, these differ, and by using the latter in config.rpath, the gettext macros think shared import libraries aren't available, and forces linking with the static library instead. (FWIW, gettext itself has already been fixed in this regard, but updating to the latest version of those files is much more invasive.) The attached patch fixes linking with the shared import libraries. We have been using this patch for over a year on i686-pc-cygwin hosted toolchains (both native- and cross-target). Yaakov Cygwin Ports 2011-07-20 Yaakov Selkowitz * config.rpath [cygwin|mingw*|pw32] (shrext): Change to .dll.a, to match the import library suffix. Index: config.rpath =================================================================== --- config.rpath (revision 176494) +++ config.rpath (working copy) @@ -438,7 +438,7 @@ bsdi4*) ;; cygwin* | mingw* | pw32*) - shrext=.dll + shrext=.dll.a ;; darwin* | rhapsody*) shrext=.dylib