You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/08/12 19:11:53 UTC
svn commit: r803603 - in /commons/sandbox/runtime/trunk/src/main/native:
Makefile.in configure
Author: mturk
Date: Wed Aug 12 17:11:52 2009
New Revision: 803603
URL: http://svn.apache.org/viewvc?rev=803603&view=rev
Log:
gcc and cc use different rpath flags
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.in
commons/sandbox/runtime/trunk/src/main/native/configure
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.in?rev=803603&r1=803602&r2=803603&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.in Wed Aug 12 17:11:52 2009
@@ -42,6 +42,7 @@
CPP=@cpp@
CXX=@cxx@
CFLAGS=@ccflags@
+EXLFLAGS=@exflags@
CPPFLAGS=@cppopts@
CXXFLAGS=@cxxopts@
LDFLAGS=@ldflags@
@@ -219,7 +220,7 @@
$(CC) $(SHFLAGS) $(OPENSSL_OBJS) $(LDFLAGS) $(SSLFLAGS) -L. -l$(NAME) -o $@
$(TESTSUITE): $(STATICLIB) $(SHAREDLIB) @modules@ $(SRCDIR)/test/testsuite.$(OBJ)
- $(CC) -Wl,-rpath -Wl,. $(SRCDIR)/test/testsuite.$(OBJ) $(LDFLAGS) -L. -l$(NAME) -o $@
+ $(CC) $(EXLFLAGS) $(SRCDIR)/test/testsuite.$(OBJ) $(LDFLAGS) -L. -l$(NAME) -o $@
test: $(TESTSUITE)
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=803603&r1=803602&r2=803603&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Wed Aug 12 17:11:52 2009
@@ -69,6 +69,7 @@
ldflags="$LDFLAGS"
shflags="$SHFLAGS"
rcflags="$RCFLAGS"
+exflags=""
includes="-I$topdir/include -I$topdir/srclib"
ssldflags=""
modules=""
@@ -378,6 +379,7 @@
varadds ccflags -fPIC -O3 -Wall -g
varadds ldflags -lrt -lpthread -ldl
varadds shflags -shared -fPIC -Wl,-soname '-Wl,\$@'
+ varadds exflags -Wl,-rpath -Wl,.
test ".$java_pinc" = . && java_pinc=linux
;;
linux-cc )
@@ -389,6 +391,7 @@
varadds ccflags -xstrconst -xdepend -O -Xa -KPIC
varadds ldflags -lpthread -ldl
varadds shflags -G -KPIC -dy
+ varadds exflags -R:.
test ".$cxx_set" = .no && cxx=CC
cpp="cc -E"
as=cc
@@ -399,6 +402,7 @@
varadds cppopts -DDARWIN=$r
varadds ccflags -fPIC -O3 -g
varadds ldflags -lpthread -ldl
+ varadds exflags -Wl,-rpath -Wl,.
if [ ".$has_jni" = .yes ]; then so=".jnilib"; else so=".dynlib"; fi
varadds shflags -dynamiclib -flat_namespace -undefined suppress -fPIC -Wl,-dylib_install_name '-Wl,\$@'
;;
@@ -419,6 +423,7 @@
varadds ccflags -xstrconst -xdepend -O -Xa -KPIC
varadds ldflags -lrt -ldl -lthread -lsendfile -lresolv -lsocket -lnsl
varadds shflags -G -KPIC -dy
+ varadds exflags -R:.
test ".$cxx_set" = .no && cxx=CC
cpp="cc -E"
as=cc
@@ -901,6 +906,7 @@
-e 's|@libdir@|'"$libdir"'|g' \
-e 's|@topdir@|'"$topdir"'|g' \
-e 's|@ccflags@|'"$ccflags"'|g' \
+ -e 's|@exflags@|'"$exflags"'|g' \
-e 's|@cppopts@|'"$cppopts"'|g' \
-e 's|@cxxopts@|'"$cxxopts"'|g' \
-e 's|@ldflags@|'"$ldflags"'|g' \