equal
deleted
inserted
replaced
382 |
382 |
383 # BUILD_TOOLS is the root of all tools not normally installed on the system. |
383 # BUILD_TOOLS is the root of all tools not normally installed on the system. |
384 BUILD_TOOLS ?= /ws/on12-tools |
384 BUILD_TOOLS ?= /ws/on12-tools |
385 |
385 |
386 SPRO_ROOT = $(BUILD_TOOLS)/SUNWspro |
386 SPRO_ROOT = $(BUILD_TOOLS)/SUNWspro |
|
387 SPRO_ROOT = /opt |
387 SPRO_VROOT = $(SPRO_ROOT)/solarisstudio12.4 |
388 SPRO_VROOT = $(SPRO_ROOT)/solarisstudio12.4 |
388 |
389 |
389 PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-1.5.1 |
390 PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-1.5.1 |
390 PARFAIT_TOOLS= $(WS_TOOLS)/$(MACH)/parfait |
391 PARFAIT_TOOLS= $(WS_TOOLS)/$(MACH)/parfait |
391 PARFAIT_TOOLS_GCC3= $(PARFAIT_TOOLS)/gcc3 |
392 PARFAIT_TOOLS_GCC3= $(PARFAIT_TOOLS)/gcc3 |
924 endif |
925 endif |
925 ifeq ($(COMPILER),gcc) |
926 ifeq ($(COMPILER),gcc) |
926 REQUIRED_PACKAGES += developer/gcc-47 |
927 REQUIRED_PACKAGES += developer/gcc-47 |
927 endif |
928 endif |
928 ifeq ($(COMPILER),studio) |
929 ifeq ($(COMPILER),studio) |
929 ifeq ($(findstring /opt/solarisstudio12.4,$(CC)),) |
930 ifneq ($(findstring /opt/solarisstudio12.4,$(CC)),) |
930 # uncomment this line if you need to install Studio |
931 # If we are setup to build with an installed compiler, require the package |
931 REQUIRED_PACKAGES += developer/solarisstudio-124 |
932 # we can uncomment this when we know that pkglint can find it. |
|
933 #REQUIRED_PACKAGES += /solarisstudio/developer/solarisstudio-124 |
932 endif |
934 endif |
933 endif |
935 endif |
934 ifeq ($(PARFAIT_BUILD),yes) |
936 ifeq ($(PARFAIT_BUILD),yes) |
935 # uncomment this line if you need to install Parfait |
937 # uncomment this line if you need to install Parfait |
936 #REQUIRED_PACKAGES += developer/parfait/parfait-tools-151 |
938 #REQUIRED_PACKAGES += developer/parfait/parfait-tools-151 |