Date: Sat, 29 Sep 2012 06:08:20 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1043 - trunk/Mk Message-ID: <201209290608.q8T68K7F071564@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Sep 29 06:08:20 2012
New Revision: 1043
Log:
don't hardcode path to runtime
Modified:
trunk/Mk/bsd.gecko.mk
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Sat Sep 29 06:08:12 2012 (r1042)
+++ trunk/Mk/bsd.gecko.mk Sat Sep 29 06:08:20 2012 (r1043)
@@ -543,7 +543,13 @@
MOZ_OPTIONS+= --prefix="${FAKEDIR}"
CPPFLAGS+= -isystem${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
+LDFLAGS+= -L${LOCALBASE}/lib
+
+.if ${OSVERSION} > 800072
+LDFLAGS+= -Wl,-z,origin -Wl,-rpath,\\\$$\$$ORIGIN
+.else
+LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
+.endif
# Standard depends
_ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip
@@ -613,7 +619,6 @@
MOZ_OPTIONS+= --disable-tests \
--enable-chrome-format=${MOZ_CHROME} \
--enable-default-toolkit=${MOZ_TOOLKIT} \
- --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--with-pthreads
# Configure options for install
.if !defined(MOZ_EXTENSIONS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209290608.q8T68K7F071564>