--- a/components/samba/Makefile	Tue Dec 20 05:20:38 2016 -0800
+++ b/components/samba/Makefile	Wed Jan 04 08:50:00 2017 -0800
@@ -20,23 +20,21 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
-# Samba uses gcc-like structure members initialization
-# ...so solarisstudio12.1 (default in 11.3) fails to compile Samba
-override SPRO_VROOT = $(SPRO_ROOT)/solarisstudio12.4
-
-# Samba does not work properly on i386 when built by studio with -xO3+.
-ifeq ($(MACH), sparc)
-WAFOPT1	= -j 32
-else
-WAFOPT1	= -j 64
 # Both SPRO_VROOT and studio_OPT vars must use the override keyword otherwise
 # Userland will ignore it and use its default value.
-override studio_OPT = -xO1
+override SPRO_VROOT= /ws/on12-tools/SUNWspro/developerstudio12.5
+
+# WAF supports huge parallelism but on build only
+WAFOPT1 = -j64
+
+ifeq ($(MACH), i386)
+# Samba does not work properly on i386 when built by studio with -xO3 and upper
+override studio_OPT = -xO2
 endif
 
 # parfait seems to spin on us