--- a/components/python/python26/Makefile Thu Jan 23 15:00:25 2014 -0800
+++ b/components/python/python26/Makefile Fri Jan 24 09:19:10 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -59,12 +59,7 @@
# requirements.
COMPONENT_BUILD_TARGETS = profile-opt
XPROFILE_DIR = $(BUILD_DIR_$(BITS))/.profile
-# the non-clang compiler we need to use for now doesn't like
-# this flag
-#ifneq ($(strip $(PARFAIT_BUILD)),yes)
-PYFLAGS.i386 = -xtarget=opteron
-#endif
-PYFLAGS.i386 += -xarch=sse2 -xcache=generic
+PYFLAGS.i386 = -xtarget=opteron -xarch=sse2 -xcache=generic
PYFLAGS.sparc =
CFLAGS += -xO5 $(PYFLAGS.$(MACH))
LDFLAGS += -xO5 $(PYFLAGS.$(MACH))
--- a/components/python/python27/Makefile Thu Jan 23 15:00:25 2014 -0800
+++ b/components/python/python27/Makefile Fri Jan 24 09:19:10 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../../../make-rules/shared-macros.mk
@@ -72,12 +72,7 @@
# requirements.
COMPONENT_BUILD_TARGETS = profile-opt
XPROFILE_DIR = $(BUILD_DIR_$(BITS))/.profile
-# the non-clang compiler we need to use for now doesn't like
-# this flag
-#ifneq ($(strip $(PARFAIT_BUILD)),yes)
-PYFLAGS.i386 = -xtarget=opteron
-#endif
-PYFLAGS.i386 += -xarch=sse2 -xcache=generic
+PYFLAGS.i386 = -xtarget=opteron -xarch=sse2 -xcache=generic
PYFLAGS.sparc =
CFLAGS += -xO5 $(PYFLAGS.$(MACH))
LDFLAGS += -xO5 $(PYFLAGS.$(MACH))
--- a/tools/Makefile Thu Jan 23 15:00:25 2014 -0800
+++ b/tools/Makefile Fri Jan 24 09:19:10 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
#
include ../make-rules/shared-macros.mk
@@ -30,6 +30,9 @@
# with the correct compiler variables from the common makefiles because
# some things reset the environment which causes lovely infinite
# loops
+#
+# currently, parfait doesn't support gcc4.7+, so we force the use
+# of gcc3 in both sets of wrappers.
links:
@$(MKDIR) $(PARFAIT_TOOLS)
@for i in cc CC gcc g++ ld ; do \
@@ -38,8 +41,8 @@
echo "IFS=" >> $(PARFAIT_TOOLS)/$$i ; \
echo "export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc" >> $(PARFAIT_TOOLS)/$$i ; \
echo "export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC" >> $(PARFAIT_TOOLS)/$$i ; \
- echo "export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc" >> $(PARFAIT_TOOLS)/$$i ; \
- echo "export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++" >> $(PARFAIT_TOOLS)/$$i ; \
+ echo "export PARFAIT_NATIVEGCC=$(GCC3_ROOT)/bin/gcc" >> $(PARFAIT_TOOLS)/$$i ; \
+ echo "export PARFAIT_NATIVEGXX=$(GCC3_ROOT)/bin/g++" >> $(PARFAIT_TOOLS)/$$i ; \
echo "export PARFAIT_NATIVELD=/usr/bin/ld" >> $(PARFAIT_TOOLS)/$$i ; \
echo "exec" $(PARFAIT_ROOT)/$(MACH)/parfait-$$i '$$*' >> $(PARFAIT_TOOLS)/$$i ; \
chmod +x $(PARFAIT_TOOLS)/$$i ; \