summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-01-28 22:54:33 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-01-28 22:54:33 +0000
commit9ca723f5f547a31c074b290fc5aad25017c2b5ab (patch)
tree242caf3f0c539e6def26b71152f9db6b6c9d2121
parentb72902e061b0efbe442945dc319e60fcbccf9e8e (diff)
fix C++ link issues on IRIX
-rwxr-xr-xbin/mklib14
1 files changed, 12 insertions, 2 deletions
diff --git a/bin/mklib b/bin/mklib
index 694a60bd17..317abc0695 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -238,7 +238,12 @@ case $ARCH in
OPTS="-n32 -shared -all"
echo "mklib: Making IRIX n32-bit shared library: " ${LIBNAME}
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}"
;;
@@ -247,7 +252,12 @@ case $ARCH in
echo "mklib: Making IRIX64 library: " ${LIBNAME}
# 64-bit ABI
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}"
;;