Przeglądaj źródła

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>
Signed-off-by: Brian Paul <brianp@vmware.com>
tags/mesa-7.9-rc1
Jon TURNEY 15 lat temu
rodzic
commit
c085cd6917
1 zmienionych plików z 10 dodań i 6 usunięć
  1. 10
    6
      bin/mklib

+ 10
- 6
bin/mklib Wyświetl plik

@@ -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

Ładowanie…
Anuluj
Zapisz