Author: elemings
Date: Wed Jun 11 13:26:00 2008
New Revision: 666829
URL: http://svn.apache.org/viewvc?rev=666829&view=rev
Log:
2008-06-11 Eric Lemings <[EMAIL PROTECTED]>
STDCXX-488
* etc/config/gcc.config: Use rpath on Darwin 9 OR LATER VERSION.
Do not use rpath on Darwin 8.
Modified:
stdcxx/branches/4.2.x/etc/config/gcc.config
Modified: stdcxx/branches/4.2.x/etc/config/gcc.config
URL:
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/gcc.config?rev=666829&r1=666828&r2=666829&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/gcc.config (original)
+++ stdcxx/branches/4.2.x/etc/config/gcc.config Wed Jun 11 13:26:00 2008
@@ -106,7 +106,7 @@
-compatibility_version 4 -current_version $(LIBVER)
# use appropriate install_name
- ifeq ($(shell [ $(OS_MAJOR) -eq 9 ] && echo 1), 1)
+ ifeq ($(shell [ $(OS_MAJOR) -ge 9 ] && echo 1), 1)
LDSOFLAGS += -install_name @rpath/$(LIBNAME)
else
LDSOFLAGS += -install_name $(LIBNAME)
@@ -207,7 +207,9 @@
endif
ifeq ($(OSNAME),Darwin)
- RPATH = -Wl,-rpath,
+ ifeq ($(shell [ $(OS_MAJOR) -ge 9 ] && echo 1), 1)
+ RPATH = -Wl,-rpath,
+ endif
endif
# debug/optimization options
