make-rules/shared-macros.mk
changeset 1394 5f86498eee95
parent 1352 1358a1e1ff4c
child 1409 9db4ba32e740
--- a/make-rules/shared-macros.mk	Fri Jul 12 09:55:54 2013 -0700
+++ b/make-rules/shared-macros.mk	Fri Jul 12 14:16:05 2013 -0700
@@ -225,7 +225,8 @@
 SPRO_ROOT =	$(BUILD_TOOLS)/SUNWspro
 SPRO_VROOT =	$(SPRO_ROOT)/sunstudio12.1
 
-PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.2.0.1
+PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.2.0.2
+PARFAIT_TOOLS=	$(WS_TOOLS)/$(MACH)/parfait
 PARFAIT= $(PARFAIT_ROOT)/bin/parfait
 export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc
 export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC
@@ -264,15 +265,15 @@
 PYTHON.2.7.VENDOR_PACKAGES = $(PYTHON.2.7.VENDOR_PACKAGES.$(BITS))
 
 ifeq   ($(strip $(PARFAIT_BUILD)),yes)
-CC.studio.32 =	$(WS_TOOLS)/parfait/cc
-CXX.studio.32 =	$(WS_TOOLS)/parfait/CC
-CC.studio.64 =	$(WS_TOOLS)/parfait/cc
-CXX.studio.64 =	$(WS_TOOLS)/parfait/CC
-CC.gcc.32 =	$(WS_TOOLS)/parfait/gcc
-CXX.gcc.32 =	$(WS_TOOLS)/parfait/g++
-CC.gcc.64 =	$(WS_TOOLS)/parfait/gcc
-CXX.gcc.64 =	$(WS_TOOLS)/parfait/g++
-LD =		$(WS_TOOLS)/parfait/ld
+CC.studio.32 =	$(PARFAIT_TOOLS)/cc
+CXX.studio.32 =	$(PARFAIT_TOOLS)/CC
+CC.studio.64 =	$(PARFAIT_TOOLS)/cc
+CXX.studio.64 =	$(PARFAIT_TOOLS)/CC
+CC.gcc.32 =	$(PARFAIT_TOOLS)/gcc
+CXX.gcc.32 =	$(PARFAIT_TOOLS)/g++
+CC.gcc.64 =	$(PARFAIT_TOOLS)/gcc
+CXX.gcc.64 =	$(PARFAIT_TOOLS)/g++
+LD =		$(PARFAIT_TOOLS)/ld
 endif
 
 CC =		$(CC.$(COMPILER).$(BITS))