--- a/components/samba/samba/Makefile	Tue Dec 17 15:19:48 2013 -0800
+++ b/components/samba/samba/Makefile	Tue Dec 17 15:59:46 2013 -0800
@@ -52,7 +52,11 @@
 ifeq ($(MACH), sparc)
 COMPILER = studio
 else
-COMPILER = gcc3
+COMPILER =	gcc
+# Parfait doesn't work with the GNU 4.7 compilers yet.
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+COMPILER =      gcc3
+endif
 endif
 
 include ../../../make-rules/prep.mk
@@ -118,6 +122,7 @@
 	cd $(BUILD_DIR) ; $(UNPACK) $(UNPACK_ARGS) ../$(COMPONENT_ARCHIVE_2)
 
 CFLAGS.studio	+=	$(studio_C99_ENABLE)
+CFLAGS.gcc	+=	-std=c99
 CFLAGS.gcc3	+=	-std=c99
 
 #CPPFLAGS +=	-DSAMBA_VERSION_VENDOR_SUFFIX=\\\"Placeholder_for_vendor_suffix\\\"