1.1 --- a/make/solaris/makefiles/buildtree.make Fri Apr 12 12:22:59 2013 -0700
1.2 +++ b/make/solaris/makefiles/buildtree.make Fri Apr 12 15:53:30 2013 -0700
1.3 @@ -19,7 +19,7 @@
1.4 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.5 # or visit www.oracle.com if you need additional information or have any
1.6 # questions.
1.7 -#
1.8 +#
1.9 #
1.10
1.11 # Usage:
1.12 @@ -46,11 +46,11 @@
1.13 # Makefile - for "make foo"
1.14 # flags.make - with macro settings
1.15 # vm.make - to support making "$(MAKE) -v vm.make" in makefiles
1.16 -# adlc.make -
1.17 +# adlc.make -
1.18 # jvmti.make - generate JVMTI bindings from the spec (JSR-163)
1.19 # sa.make - generate SA jar file and natives
1.20 # env.[ck]sh - environment settings
1.21 -#
1.22 +#
1.23 # The makefiles are split this way so that "make foo" will run faster by not
1.24 # having to read the dependency files for the vm.
1.25
1.26 @@ -69,7 +69,7 @@
1.27 GCC_LIB = /usr/local/lib
1.28 else
1.29 PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
1.30 -GCC_LIB =
1.31 +GCC_LIB =
1.32 endif
1.33
1.34 ifdef FORCE_TIERED
1.35 @@ -110,7 +110,7 @@
1.36 $(PLATFORM_DIR)/generated/adfiles \
1.37 $(PLATFORM_DIR)/generated/jvmtifiles
1.38
1.39 -TARGETS = debug fastdebug jvmg optimized product profiled
1.40 +TARGETS = debug fastdebug optimized product
1.41 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
1.42
1.43 # For dependencies and recursive makes.
1.44 @@ -153,7 +153,7 @@
1.45 endif
1.46 endif
1.47
1.48 -BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
1.49 +BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
1.50
1.51 BUILDTREE = \
1.52 $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS)
1.53 @@ -172,8 +172,8 @@
1.54 $(QUIETLY) mkdir -p $@
1.55
1.56 # Convenience macro which takes a source relative path, applies $(1) to the
1.57 -# absolute path, and then replaces $(GAMMADIR) in the result with a
1.58 -# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.
1.59 +# absolute path, and then replaces $(GAMMADIR) in the result with a
1.60 +# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.
1.61 gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2)))
1.62
1.63 # This bit is needed to enable local rebuilds.
1.64 @@ -274,8 +274,6 @@
1.65 $(QUIETLY) ( \
1.66 $(BUILDTREE_COMMENT); \
1.67 echo; \
1.68 - [ "$(TARGET)" = profiled ] && \
1.69 - echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/optimized.make"; \
1.70 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \
1.71 ) > $@
1.72
1.73 @@ -366,7 +364,7 @@
1.74 $(QUIETLY) ( \
1.75 $(BUILDTREE_COMMENT); \
1.76 echo "JDK=${JAVA_HOME}"; \
1.77 - ) > $@
1.78 + ) > $@
1.79
1.80 FORCE:
1.81
