Commit 9ca723f5 authored by Brian Paul's avatar Brian Paul

fix C++ link issues on IRIX

parent b72902e0
...@@ -238,7 +238,12 @@ case $ARCH in ...@@ -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 ...@@ -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}"
;; ;;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment