diff options
| author | Brian Paul <[email protected]> | 2004-03-30 14:47:02 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2004-03-30 14:47:02 +0000 |
| commit | 52fb07e2b2e4b207fa519f25468a3d2105fca393 (patch) | |
| tree | 666a5b30a37b219f45ea5d72b4dc4a0de539d470 | |
| parent | 257c085db9df083673e2826c93b7625345aa959d (diff) | |
merge from 6.0.1 branch
| -rw-r--r-- | Make-config | 1 | ||||
| -rwxr-xr-x | bin/mklib | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Make-config b/Make-config index 3e4b98597ab..2b2362fa007 100644 --- a/Make-config +++ b/Make-config @@ -340,6 +340,7 @@ hpux10: "CXX = aCC" \ "CFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM" \ "CXXFLAGS = +O3 +DAportable -Aa -D_HPUX_SOURCE" \ + "MKLIB_OPTIONS = -static" \ "APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -L/usr/lib -lCsup" hpux10-sl: diff --git a/bin/mklib b/bin/mklib index ef6dd129b59..e7931e44dc4 100755 --- a/bin/mklib +++ b/bin/mklib @@ -290,14 +290,14 @@ case $ARCH in 'HP-UX') if [ $STATIC = 1 ] ; then LIBNAME="lib${LIBNAME}.a" - echo "mklib: Making HPUX static library: " ${LIBNAME} + echo "mklib: Making HP-UX static library: " ${LIBNAME} rm -f ${LIBNAME} ar -ruv ${LIBNAME} ${OBJECTS} FINAL_LIBS=${LIBNAME} else RUNLIB="lib${LIBNAME}.${MAJOR}" DEVLIB="lib${LIBNAME}.sl" - echo "mklib: Making HPUX stared library: " ${RUNLIB} ${DEVLIB} + echo "mklib: Making HP-UX shared library: " ${RUNLIB} ${DEVLIB} ld -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS} ln -s ${RUNLIB} ${DEVLIB} FINAL_LIBS="{RUNLIB} ${DEVLIB}" |