fix C++ link issues on IRIX
This commit is contained in:
14
bin/mklib
14
bin/mklib
@@ -238,7 +238,12 @@ case $ARCH in
|
|||||||
OPTS="-n32 -shared -all"
|
OPTS="-n32 -shared -all"
|
||||||
echo "mklib: Making IRIX n32-bit shared library: " ${LIBNAME}
|
echo "mklib: Making IRIX n32-bit shared library: " ${LIBNAME}
|
||||||
fi
|
fi
|
||||||
ld ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
|
if [ $CPLUSPLUS = 1 ] ; then
|
||||||
|
LINK="CC"
|
||||||
|
else
|
||||||
|
LINK="ld"
|
||||||
|
fi
|
||||||
|
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
|
||||||
FINAL_LIBS="${LIBNAME}"
|
FINAL_LIBS="${LIBNAME}"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@@ -247,7 +252,12 @@ case $ARCH in
|
|||||||
echo "mklib: Making IRIX64 library: " ${LIBNAME}
|
echo "mklib: Making IRIX64 library: " ${LIBNAME}
|
||||||
# 64-bit ABI
|
# 64-bit ABI
|
||||||
OPTS="-64 -shared -all"
|
OPTS="-64 -shared -all"
|
||||||
ld ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
|
if [ $CPLUSPLUS = 1 ] ; then
|
||||||
|
LINK="CC"
|
||||||
|
else
|
||||||
|
LINK="ld"
|
||||||
|
fi
|
||||||
|
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
|
||||||
FINAL_LIBS="${LIBNAME}"
|
FINAL_LIBS="${LIBNAME}"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user