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

[Robert Millan]

Author: rmh
Date: 2011-10-22 13:10:15 +0000 (Sat, 22 Oct 2011)
New Revision: 3757

Modified:
   trunk/kfreebsd-10/debian/patches/001_misc.diff
Log:
Patch cleanup. Detect FreeBSD GCC instead of FreeBSD.

Modified: trunk/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/001_misc.diff	2011-10-22 12:29:55 UTC (rev 3756)
+++ trunk/kfreebsd-10/debian/patches/001_misc.diff	2011-10-22 13:10:15 UTC (rev 3757)
@@ -1,20 +1,17 @@
-
-Sent to freebsd-hackers (2011-07-05)
-
 --- a/sys/conf/kern.mk
 +++ b/sys/conf/kern.mk
-@@ -1,12 +1,23 @@
+@@ -1,11 +1,21 @@
  # $FreeBSD$
  
-+.if !defined(OPSYS)
-+OPSYS!=		uname -s
++.if ${CC:T:Mclang} != "clang"
++FREEBSD_GCC!=	${CC} --version | grep FreeBSD || true
 +.endif
 +
  #
  # Warning flags for compiling the kernel and components of the kernel:
  #
-+.if ${OPSYS} == "FreeBSD"
-+# FreeBSD extension, not available in upstream GCC
++.if ${FREEBSD_GCC}
++# FreeBSD extensions, not available in upstream GCC
 +format_extensions=	-fformat-extensions
 +no_align_long_strings=	-mno-align-long-strings
 +.endif
@@ -24,11 +21,9 @@
 -		-Wundef -Wno-pointer-sign -fformat-extensions \
 +		-Wundef -Wno-pointer-sign ${format_extensions} \
  		-Wmissing-include-dirs -fdiagnostics-show-option
-+
  #
  # The following flags are next up for working on:
- #	-Wextra
-@@ -32,7 +43,7 @@
+@@ -32,7 +42,7 @@
  #
  .if ${MACHINE_CPUARCH} == "i386"
  .if ${CC:T:Mclang} != "clang"