summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2005-10-18 23:36:40 +0000
committerEric Anholt <anholt@FreeBSD.org>2005-10-18 23:36:40 +0000
commitb83435f53b8dd487d48f1133118f69be87023aef (patch)
treed3f5af79c8ee3de3294a4d1d49c9b03a526b07fc /bin
parentd99c37bca6c53535e748804b15ab5b614aa0da48 (diff)
Attempt to fix libGL on FreeBSD, where the library was being built without any
dependencies, breaking builds of third-party software.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/mklib20
1 files changed, 16 insertions, 4 deletions
diff --git a/bin/mklib b/bin/mklib
index c754373e83..77698d3630 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -307,11 +307,23 @@ case $ARCH in
;;
'FreeBSD')
+ # we assume gcc
+
+ 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 FreeBSD shared library: " ${LIBNAME}
+ OPTS="-shared"
rm -f ${LIBNAME}
- ld -Bshareable -o ${LIBNAME} ${OBJECTS}
+ ${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS=${LIBNAME}
elif [ $STATIC = 1 ] ; then
STLIB="lib${LIBNAME}.a"
@@ -321,11 +333,11 @@ case $ARCH in
ranlib ${STLIB}
FINAL_LIBS=${STLIB}
else
- SHLIB="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
+ SHLIB="lib${LIBNAME}.so.${MAJOR}"
+ OPTS="-shared -Wl,-soname,${SHLIB}"
echo "mklib: Making FreeBSD shared library: " ${SHLIB}
rm -f ${SHLIB}
- ld -Bshareable -o ${SHLIB} ${OBJECTS}
- # XXX make lib${LIBNAME}.so.${MAJOR} symlink?
+ ${LINK} ${OPTS} -o ${SHLIB} ${OBJECTS} ${DEPS}
FINAL_LIBS=${SHLIB}
fi
;;