Revision

15649

Author

mikej

Date

2009-11-23 20:55:34 -0600 (Mon, 23 Nov 2009)

Log Message

pass ldflags to dso builds for libjs and nspr

Modified Paths

• freeswitch/trunk/libs/js/Makefile.in
• freeswitch/trunk/libs/js/nsprpub/configure.in

Diff

--- freeswitch/trunk/libs/js/Makefile.in	2009-11-24 00:17:18 UTC (rev 15648)
+++ freeswitch/trunk/libs/js/Makefile.in	2009-11-24 02:55:34 UTC (rev 15649)
@@ -156,7 +156,7 @@
 	@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 
 $(LIB_NAME): $(LIB_OBJS)
-	@$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) -version-info 1:6
+	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) -version-info 1:6
 
 $(CLI_NAME): $(CLI_OBJS) $(LIB_NAME)
 	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) $(CFLAGS) -o $(CLI_NAME) $(CLI_OBJS) $(LIB_NAME) $(LIBS) $(CLI_LIBS)

--- freeswitch/trunk/libs/js/nsprpub/configure.in	2009-11-24 00:17:18 UTC (rev 15648)
+++ freeswitch/trunk/libs/js/nsprpub/configure.in	2009-11-24 02:55:34 UTC (rev 15649)
@@ -617,7 +617,7 @@
 LIB_SUFFIX=a
 DLL_SUFFIX=so
 ASM_SUFFIX=s
-MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
+MKSHLIB='$(LD) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
 PR_MD_ASFILES=
 PR_MD_CSRCS=
 PR_MD_ARCH_DIR=unix
@@ -986,7 +986,7 @@
     DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name ${prefix}/lib/$@ -headerpad_max_install_names'
     # Use the standard preprocessor (cpp)
     CFLAGS="$CFLAGS -no-cpp-precomp"
-    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+    MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
     STRIP="$STRIP -x -S"
     DLL_SUFFIX=dylib
     USE_PTHREADS=1
@@ -1132,7 +1132,7 @@
     else
         DLL_SUFFIX=so.1
     fi
-    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+    MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
     DSO_CFLAGS=-fPIC
     DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
     MDCPUCFG_H=_freebsd.cfg
@@ -1401,7 +1401,7 @@
     esac
     MDCPUCFG_H=_linux.cfg
     PR_MD_CSRCS=linux.c
-    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+    MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
     DSO_CFLAGS=-fPIC
     DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
     _OPTIMIZE_FLAGS=-O2
@@ -1660,7 +1660,7 @@
     DSO_CFLAGS='-fPIC -DPIC'
     CFLAGS="$CFLAGS -ansi -Wall"
     CXXFLAGS="$CXXFLAGS -ansi -Wall"
-    MKSHLIB='$(CC) -o $@ $(DSO_LDOPTS)'
+    MKSHLIB='$(CC) -o $@ $(DSO_LDOPTS) $(OS_LDFLAGS) '
 
     if test -z "$OBJECT_FMT"; then
         if echo __ELF__ | ${CC-cc} -E - | grep -q __ELF__ 2>/dev/null; then
@@ -1741,7 +1741,7 @@
         USE_PTHREADS=1
     fi
     DSO_LDOPTS='-shared -fPIC'
-    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+    MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
     ;;
 
 *-openvms*)
@@ -1911,7 +1911,7 @@
     MDCPUCFG_H=_solaris.cfg
     PR_MD_CSRCS=solaris.c
     LD=/usr/ccs/bin/ld
-    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+    MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
     RESOLVE_LINK_SYMBOLS=1
     if test -n "$GNU_CC"; then
         DSO_CFLAGS=-fPIC