kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pass ldflags to dso builds for libjs and nspr 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15649 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-11-24 02:55:34 +00:00
parent ee1dd4f37f
commit 70d80b4588
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/js/Makefile.in
View File

@ -156,7 +156,7 @@ subdirs:
@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
$(LIB_NAME): $(LIB_OBJS) $(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) $(CLI_NAME): $(CLI_OBJS) $(LIB_NAME)
@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) $(CFLAGS) -o $(CLI_NAME) $(CLI_OBJS) $(LIB_NAME) $(LIBS) $(CLI_LIBS) @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) $(CFLAGS) -o $(CLI_NAME) $(CLI_OBJS) $(LIB_NAME) $(LIBS) $(CLI_LIBS)

14
libs/js/nsprpub/configure.in
View File

@ -617,7 +617,7 @@ OBJ_SUFFIX=o
LIB_SUFFIX=a LIB_SUFFIX=a
DLL_SUFFIX=so DLL_SUFFIX=so
ASM_SUFFIX=s ASM_SUFFIX=s
MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' MKSHLIB='$(LD) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
PR_MD_ASFILES= PR_MD_ASFILES=
PR_MD_CSRCS= PR_MD_CSRCS=
PR_MD_ARCH_DIR=unix PR_MD_ARCH_DIR=unix
@ -986,7 +986,7 @@ case "$target" in
DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name ${prefix}/lib/$@ -headerpad_max_install_names' DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name ${prefix}/lib/$@ -headerpad_max_install_names'
# Use the standard preprocessor (cpp) # Use the standard preprocessor (cpp)
CFLAGS="$CFLAGS -no-cpp-precomp" CFLAGS="$CFLAGS -no-cpp-precomp"
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
STRIP="$STRIP -x -S" STRIP="$STRIP -x -S"
DLL_SUFFIX=dylib DLL_SUFFIX=dylib
USE_PTHREADS=1 USE_PTHREADS=1
@ -1132,7 +1132,7 @@ tools are selected during the Xcode/Developer Tools installation.])
else else
DLL_SUFFIX=so.1 DLL_SUFFIX=so.1
fi fi
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
DSO_CFLAGS=-fPIC DSO_CFLAGS=-fPIC
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
MDCPUCFG_H=_freebsd.cfg MDCPUCFG_H=_freebsd.cfg
@ -1401,7 +1401,7 @@ tools are selected during the Xcode/Developer Tools installation.])
esac esac
MDCPUCFG_H=_linux.cfg MDCPUCFG_H=_linux.cfg
PR_MD_CSRCS=linux.c PR_MD_CSRCS=linux.c
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
DSO_CFLAGS=-fPIC DSO_CFLAGS=-fPIC
DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
_OPTIMIZE_FLAGS=-O2 _OPTIMIZE_FLAGS=-O2
@ -1660,7 +1660,7 @@ mips-nec-sysv*)
DSO_CFLAGS='-fPIC -DPIC' DSO_CFLAGS='-fPIC -DPIC'
CFLAGS="$CFLAGS -ansi -Wall" CFLAGS="$CFLAGS -ansi -Wall"
CXXFLAGS="$CXXFLAGS -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 test -z "$OBJECT_FMT"; then
if echo __ELF__ | ${CC-cc} -E - | grep -q __ELF__ 2>/dev/null; then if echo __ELF__ | ${CC-cc} -E - | grep -q __ELF__ 2>/dev/null; then
@ -1741,7 +1741,7 @@ mips-sony-newsos*)
USE_PTHREADS=1 USE_PTHREADS=1
fi fi
DSO_LDOPTS='-shared -fPIC' DSO_LDOPTS='-shared -fPIC'
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
;; ;;
*-openvms*) *-openvms*)
@ -1911,7 +1911,7 @@ mips-sony-newsos*)
MDCPUCFG_H=_solaris.cfg MDCPUCFG_H=_solaris.cfg
PR_MD_CSRCS=solaris.c PR_MD_CSRCS=solaris.c
LD=/usr/ccs/bin/ld LD=/usr/ccs/bin/ld
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' MKSHLIB='$(CC) $(DSO_LDOPTS) $(OS_LDFLAGS) -o $@'
RESOLVE_LINK_SYMBOLS=1 RESOLVE_LINK_SYMBOLS=1
if test -n "$GNU_CC"; then if test -n "$GNU_CC"; then
DSO_CFLAGS=-fPIC DSO_CFLAGS=-fPIC