1 diff -urp -x '*~' -x '*.orig' bin/mklib bin/mklib

     2 --- bin/mklib	2008-10-03 14:18:14.760469000 -0700

     3 +++ bin/mklib	2008-10-03 14:18:25.239726000 -0700

     4 @@ -372,6 +372,12 @@ case $ARCH in

     5  		fi

     6  	    fi

     7  

     8 +	    # If using Sun C++ compiler, need to tell it not to add runpaths

     9 +	    # that are specific to the build machine

    10 +	    if [ ${LINK} = "CC" ] ; then

    11 +		OPTS="${OPTS} -norunpath"

    12 +	    fi

    13 +

    14  	    # Check if objects are SPARC v9

    15  	    # file says: ELF 64-bit MSB relocatable SPARCV9 Version 1

    16  	    set ${OBJECTS}

    17 @@ -387,6 +393,9 @@ case $ARCH in

    18  

    19  	    # Solaris linker requires explicitly listing the Standard C & C++

    20  	    # libraries in the link path when building shared objects

    21 +	    if [ ${LINK} = "CC" ] ; then

    22 +		DEPS="${DEPS} -lCrun"

    23 +	    fi

    24  	    DEPS="${DEPS} -lc"

    25  

    26  	    if [ $EXPORTS ] ; then