Mesa (master): darwin: mklib: Make the real file match the id
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Wed Jun 8 18:47:44 UTC 2011
Module: Mesa
Branch: master
Commit: 2835c5112de59a0713fe1c78efbe77ea855a3eed
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2835c5112de59a0713fe1c78efbe77ea855a3eed
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Wed Jun 8 11:20:38 2011 -0700
darwin: mklib: Make the real file match the id
This makes mesa more consistent with glibtool and XCode where the
generated file matches the dylib id rather using an extra symlink
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
bin/mklib | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/bin/mklib b/bin/mklib
index a511375..2c7ed38 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -767,9 +767,8 @@ case $ARCH in
OPTS="${OPTS} -exported_symbols_list ${EXPORTS}"
fi
- LINKNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
- LINKNAME2="lib${LIBNAME}.${LIBSUFFIX}"
- LIBNAME="lib${LIBNAME}.${MAJOR}.${MINOR}.${LIBSUFFIX}"
+ LINKNAME="lib${LIBNAME}.${LIBSUFFIX}"
+ LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
# examine first object to determine ABI
set ${OBJECTS}
@@ -782,9 +781,6 @@ case $ARCH in
OPTS=${ALTOPTS}
fi
- # XXX can we always add -isysroot /Developer/SDKs/MacOSX10.4u.sdk
- # to OPTS here?
-
# determine linker
if [ $CPLUSPLUS = 1 ] ; then
LINK="g++"
@@ -796,8 +792,7 @@ case $ARCH in
${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
ln -s ${LIBNAME} ${LINKNAME}
- ln -s ${LIBNAME} ${LINKNAME2}
- FINAL_LIBS="${LIBNAME} ${LINKNAME} ${LINKNAME2}"
+ FINAL_LIBS="${LIBNAME} ${LINKNAME}"
fi
;;
More information about the mesa-commit
mailing list