summaryrefslogtreecommitdiff
path: root/bin/mklib
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-06-08 11:20:38 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-06-08 11:24:26 -0700
commit2835c5112de59a0713fe1c78efbe77ea855a3eed (patch)
tree4fe80850ee531ba8682f7ef763db08d802567e68 /bin/mklib
parentaea2236af60aee329e6ea73a41f2410d8eacc7b6 (diff)
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@apple.com>
Diffstat (limited to 'bin/mklib')
-rwxr-xr-xbin/mklib11
1 files changed, 3 insertions, 8 deletions
diff --git a/bin/mklib b/bin/mklib
index a511375e20e..2c7ed3880ae 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
;;