Mesa (master): Cygwin: Adjust mklib so -linker and -cplusplus options are processed more like they are for linux
Brian Paul
brianp at kemper.freedesktop.org
Wed Sep 1 14:49:38 UTC 2010
Module: Mesa
Branch: master
Commit: c085cd6917310ab35325f84311258905b5ded66b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c085cd6917310ab35325f84311258905b5ded66b
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Fri Aug 27 22:52:41 2010 +0100
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 at dronecode.org.uk>
Signed-off-by: Brian Paul <brianp at vmware.com>
---
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
More information about the mesa-commit
mailing list