[Glibc-bsd-commits] r4119 - trunk/kfreebsd-10/debian/patches

[Robert Millan]

Author: rmh
Date: 2012-02-25 15:33:37 +0000 (Sat, 25 Feb 2012)
New Revision: 4119

Modified:
   trunk/kfreebsd-10/debian/patches/001_misc.diff
Log:
Merge improvements by Nali Toja

Modified: trunk/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/001_misc.diff	2012-02-25 12:00:31 UTC (rev 4118)
+++ trunk/kfreebsd-10/debian/patches/001_misc.diff	2012-02-25 15:33:37 UTC (rev 4119)
@@ -1,3 +1,6 @@
+
+Co-authored by Nali Toja
+
 --- a/sys/conf/kern.mk
 +++ b/sys/conf/kern.mk
 @@ -1,11 +1,20 @@
@@ -4,14 +7,14 @@
  # $FreeBSD$
  
 +.if ${CC:T:Mclang} != "clang"
-+FREEBSD_GCC!=  ${CC} --version | grep FreeBSD || true
++FREEBSD_CC!=   ${CC} -dM -E -</dev/null | awk '/__FreeBSD_cc_version/ { print $$3 }' || true
 +.endif
 +
  #
  # Warning flags for compiling the kernel and components of the kernel:
  #
-+.if ${FREEBSD_GCC}
-+# FreeBSD extensions, not available in upstream GCC
++.if ${FREEBSD_CC}
++# FreeBSD extensions
 +format_extensions=     -fformat-extensions
 +no_align_long_strings= -mno-align-long-strings
 +.endif