Attachment 38305 Details for Bug 29282 – Adjust mklib so -linker and -cplusplus options are processed on cygwin more like they are for linux

[patch] Adjust mklib so -linker and -cplusplus options are processed on cygwin more like they are for linux

0004-Cygwin-Adjust-mklib-so-linker-and-cplusplus-options-.patch (text/plain), 1.47 KB, created by Jon Turney on 2010-08-30 08:18:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jon Turney

Created: 2010-08-30 08:18:24 UTC

Size: 1.47 KB

patch

obsolete

>From 82f8a627cffa53ceac6b9eff02baa8ef3602aec4 Mon Sep 17 00:00:00 2001
>From: Jon TURNEY <jon.turney@dronecode.org.uk>
>Date: Fri, 27 Aug 2010 22:52:41 +0100
>Subject: [PATCH 4/4] Cygwin: Adjust mklib so -linker and -cplusplus options are processed more like they are for linux
>
>It looks like we were ignoring -linker when -noprefix wasn't present, and
>when -noprefix was present, -linker was mandatory and -cplusplus ignored.
>
>Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
>---
> bin/mklib |   16 ++++++++++------
> 1 files changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/bin/mklib b/bin/mklib
>index bc554c1..2f9223f 100755
>--- a/bin/mklib
>+++ b/bin/mklib
>@@ -930,6 +930,16 @@ case $ARCH in
> 
>      CYGWIN*)
> 	# GCC-based environment
>+
>+	if [ "x$LINK" = "x" ] ; then
>+	    # -linker was not specified so set default link command now
>+            if [ $CPLUSPLUS = 1 ] ; then
>+                LINK=g++
>+            else
>+                LINK=gcc
>+            fi
>+	fi
>+
> 	if [ $NOPREFIX = 1 ] ; then
> 	    # No "lib" or ".so" part
> 	    echo "mklib: Making CYGWIN shared library: " ${LIBNAME}
>@@ -966,12 +976,6 @@ case $ARCH in
>             fi
>             echo "mklib: Making CYGWIN shared library: " ${CYGNAME}-${MAJOR}.dll
> 
>-            if [ $CPLUSPLUS = 1 ] ; then
>-                LINK="g++"
>-            else
>-                LINK="gcc"
>-            fi
>-
>             # rm any old libs
>             rm -f ${CYGNAME}-${MAJOR}.dll
>             rm -f ${LIBNAME}-${MAJOR}.dll.a
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 29282: 37422 | 37423 | 37424 | 38305

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.