On Tue, Jul 15, 2014 at 02:31:59AM +0000, Viktor Dukhovni wrote:
> Actually, AUXLIBS should come before SYSLIBS, so the correct patch is:
> 
> diff --git a/makedefs b/makedefs

Thanks.  Works for me.

Any chance of using ${CC} for the linking stage as well?  Perhaps
something along the lines of:

--- makedefs    2014-07-15 04:40:08.349864932 +0000
+++ makedefs    2014-07-15 06:21:09.252817290 +0000
@@ -200,18 +200,18 @@
   FreeBSD.8*)  SYSTYPE=FREEBSD8
                : ${SHLIB_SUFFIX=.so}
                : ${SHLIB_CFLAGS=-fPIC}
-               : ${SHLIB_LD='gcc -shared -Wl,-soname,${LIB}'}
+               : ${SHLIB_LD="${CC-gcc} -shared -Wl,-soname,\${LIB}"}
                : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
                : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
-               : ${PLUGIN_LD='gcc -shared'}
+               : ${PLUGIN_LD="${CC-gcc} -shared"}
                ;;
   FreeBSD.9*)  SYSTYPE=FREEBSD9
                : ${SHLIB_SUFFIX=.so}
                : ${SHLIB_CFLAGS=-fPIC}
-               : ${SHLIB_LD='gcc -shared -Wl,-soname,${LIB}'}
+               : ${SHLIB_LD="${CC-gcc} -shared -Wl,-soname,\${LIB}"}
                : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
                : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
-               : ${PLUGIN_LD='gcc -shared'}
+               : ${PLUGIN_LD="${CC-gcc} -shared"}
                ;;
  DragonFly.*)  SYSTYPE=DRAGONFLY
                ;;
@@ -259,10 +259,10 @@
                SYSLIBS="-lresolv -lsocket -lnsl -ldl"
                : ${SHLIB_SUFFIX=.so}
                : ${SHLIB_CFLAGS=-fPIC}
-               : ${SHLIB_LD='gcc -shared -Wl,-h,${LIB}'}
+               : ${SHLIB_LD="${CC-gcc} -shared -Wl,-h,\${LIB}"}
                : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
                : ${SHLIB_RPATH='-Wl,-R,${SHLIB_DIR}'}
-               : ${PLUGIN_LD='gcc -shared'}
+               : ${PLUGIN_LD="${CC-gcc} -shared"}
                # Stock awk breaks with >10 files.
                test -x /usr/xpg4/bin/awk && AWK=/usr/xpg4/bin/awk
                # Solaris 2.5 added usleep(), POSIX regexp, POSIX getpwnam/uid_r
@@ -425,10 +425,10 @@
                SYSLIBS="$SYSLIBS -ldl"
                : ${SHLIB_SUFFIX=.so}
                : ${SHLIB_CFLAGS=-fPIC}
-               : ${SHLIB_LD='gcc -shared -Wl,-soname,${LIB}'}
+               : ${SHLIB_LD="${CC-gcc} -shared -Wl,-soname,\${LIB}"}
                : ${SHLIB_RPATH='-Wl,--enable-new-dtags 
-Wl,-rpath,${SHLIB_DIR}'}
                : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
-               : ${PLUGIN_LD='gcc -shared'}
+               : ${PLUGIN_LD="${CC-gcc} -shared"}
                ;;
     Linux.3*)  SYSTYPE=LINUX3
                case "$CCARGS" in
@@ -463,10 +463,10 @@
                SYSLIBS="$SYSLIBS -ldl"
                : ${SHLIB_SUFFIX=.so}
                : ${SHLIB_CFLAGS=-fPIC}
-               : ${SHLIB_LD='gcc -shared -Wl,-soname,${LIB}'}
+               : ${SHLIB_LD="${CC-gcc} -shared -Wl,-soname,\${LIB}"}
                : ${SHLIB_RPATH='-Wl,--enable-new-dtags 
-Wl,-rpath,${SHLIB_DIR}'}
                : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
-               : ${PLUGIN_LD='gcc -shared'}
+               : ${PLUGIN_LD="${CC-gcc} -shared"}
                ;;
      GNU.0*|GNU/kFreeBSD.[567]*)
                SYSTYPE=GNU0

-- 
Eray

Reply via email to