From 559eb69e165a8222feb6a05e3283f7e8f01c6219 Mon Sep 17 00:00:00 2001 From: dholmes Date: Wed, 17 Dec 2014 20:26:12 -0500 Subject: 8038189: Add cross-platform compact profiles support Summary: Generalize the compact profile support so it can be used on any platform Reviewed-by: erikj --- make/Main.gmk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'make') diff --git a/make/Main.gmk b/make/Main.gmk index acb4faa..ecfae53 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -142,17 +142,12 @@ overlay-images-only: start-make @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images) @$(call TargetExit) -profiles: profiles-oscheck source-tips jdk hotspot profiles-only +profiles: source-tips jdk hotspot profiles-only profiles-only: start-make @$(call TargetEnter) @($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles) @$(call TargetExit) -profiles-oscheck: - ifneq ($(OPENJDK_TARGET_OS), linux) - @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1 - endif - install: images install-only install-only: start-make @$(call TargetEnter) @@ -240,7 +235,7 @@ clean-test: .PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only .PHONY: default all clean dist-clean bootcycle-images start-make .PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build -.PHONY: profiles profiles-only profiles-oscheck +.PHONY: profiles profiles-only include $(root_dir)/make/Jprt.gmk -- cgit v1.2.3