svn commit: r301973 - head/Mk

Gerald Pfeifer gerald at FreeBSD.org
Fri Aug 3 21:23:05 UTC 2012


Author: gerald
Date: Fri Aug  3 21:23:04 2012
New Revision: 301973
URL: http://svn.freebsd.org/changeset/ports/301973

Log:
  Introduce _GCC_RUNTIME, to be used by ports in need of knowing the
  run-time directory of the version of GCC in use.
  
  As a side effect this fixes the inclusion of said directory into
  CFLAGS and LDFLAGS (and FFLAGS where applicable). [1]
  
  Reported by:	Scott Allendorf <scott-allendorf at uiowa.edu> [1]

Modified:
  head/Mk/bsd.gcc.mk

Modified: head/Mk/bsd.gcc.mk
==============================================================================
--- head/Mk/bsd.gcc.mk	Fri Aug  3 21:13:50 2012	(r301972)
+++ head/Mk/bsd.gcc.mk	Fri Aug  3 21:23:04 2012	(r301973)
@@ -189,11 +189,12 @@ CC:=			gcc${V}
 CXX:=			g++${V}
 CPP:=			cpp${V}
 .   if ${_USE_GCC} != 3.4
-CFLAGS+=		-Wl,-rpath=${LOCALBASE}/lib/gcc${V}
-LDFLAGS+=		-Wl,-rpath=${LOCALBASE}/lib/gcc${V}
+_GCC_RUNTIME:=		${LOCALBASE}/lib/gcc${V}
+CFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME}
+LDFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME}
 .    if defined (USE_FORTRAN)
 .    if ${USE_FORTRAN} == yes
-FFLAGS+=		-Wl,-rpath=${LOCALBASE}/lib/gcc${V}
+FFLAGS+=		-Wl,-rpath=${_GCC_RUNTIME}
 .    endif
 .    endif
 # The following is for the sakes of some ports which use this without



More information about the svn-ports-all mailing list