Mon Oct 8 20:02:17 2018 UTC ()
Remove trailing whitespace


(rillig)
diff -r1.193 -r1.194 pkgsrc/mk/compiler/gcc.mk
cvs diff -r1.193 -r1.194 pkgsrc/mk/compiler/gcc.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/gcc.mk 2018/07/11 11:11:52 1.193
+++ pkgsrc/mk/compiler/gcc.mk 2018/10/08 20:02:17 1.194
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gcc.mk,v 1.193 2018/07/11 11:11:52 jperkin Exp $ 1# $NetBSD: gcc.mk,v 1.194 2018/10/08 20:02:17 rillig Exp $
2# 2#
3# This is the compiler definition for the GNU Compiler Collection. 3# This is the compiler definition for the GNU Compiler Collection.
4# 4#
5# User-settable variables: 5# User-settable variables:
6# 6#
7# GCCBASE 7# GCCBASE
8# If using a native GCC and the compiler is not in $PATH then 8# If using a native GCC and the compiler is not in $PATH then
9# this should be set to the base installation directory. 9# this should be set to the base installation directory.
10# 10#
11# USE_NATIVE_GCC 11# USE_NATIVE_GCC
12# When set to "yes", the native gcc is used, no matter which 12# When set to "yes", the native gcc is used, no matter which
13# compiler version a package requires. 13# compiler version a package requires.
14# 14#
@@ -722,27 +722,27 @@ _GCC_LIBDIRS= ${_GCC_ARCHDIR} @@ -722,27 +722,27 @@ _GCC_LIBDIRS= ${_GCC_ARCHDIR}
722. if empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss]) 722. if empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
723_GCC_LIBDIRS+= ${_GCC_PREFIX}lib${LIBABISUFFIX} 723_GCC_LIBDIRS+= ${_GCC_PREFIX}lib${LIBABISUFFIX}
724. endif 724. endif
725_GCC_LDFLAGS= # empty 725_GCC_LDFLAGS= # empty
726. for _dir_ in ${_GCC_LIBDIRS:N*not_found*} 726. for _dir_ in ${_GCC_LIBDIRS:N*not_found*}
727_GCC_LDFLAGS+= -L${_dir_} ${COMPILER_RPATH_FLAG}${_dir_} 727_GCC_LDFLAGS+= -L${_dir_} ${COMPILER_RPATH_FLAG}${_dir_}
728. endfor 728. endfor
729.endif 729.endif
730 730
731.if ${_PKGSRC_USE_RELRO} == "yes" 731.if ${_PKGSRC_USE_RELRO} == "yes"
732_GCC_LDFLAGS+= ${_RELRO_LDFLAGS} 732_GCC_LDFLAGS+= ${_RELRO_LDFLAGS}
733CWRAPPERS_APPEND.ld+= ${_RELRO_LDFLAGS} 733CWRAPPERS_APPEND.ld+= ${_RELRO_LDFLAGS}
734.endif 734.endif
735  735
736LDFLAGS+= ${_GCC_LDFLAGS} 736LDFLAGS+= ${_GCC_LDFLAGS}
737 737
738# Point the variables that specify the compiler to the installed 738# Point the variables that specify the compiler to the installed
739# GCC executables. 739# GCC executables.
740# 740#
741_GCC_DIR= ${WRKDIR}/.gcc 741_GCC_DIR= ${WRKDIR}/.gcc
742_GCC_VARS= # empty 742_GCC_VARS= # empty
743 743
744.if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS]) 744.if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
745_GCCBINDIR= ${_GCC_PREFIX}bin 745_GCCBINDIR= ${_GCC_PREFIX}bin
746.elif !empty(_IS_BUILTIN_GCC:M[yY][eE][sS]) 746.elif !empty(_IS_BUILTIN_GCC:M[yY][eE][sS])
747_GCCBINDIR= ${_CC:H} 747_GCCBINDIR= ${_CC:H}
748.endif 748.endif