make/Main.gmk

changeset 1291
730f885548b4
parent 1140
6d0ebf545f49
child 1482
8fb429038513
child 2211
2209644bcac4
     1.1 --- a/make/Main.gmk	Wed Dec 17 10:43:35 2014 -0800
     1.2 +++ b/make/Main.gmk	Wed Dec 17 20:26:12 2014 -0500
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -142,17 +142,12 @@
    1.11  	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
    1.12  	@$(call TargetExit)
    1.13  
    1.14 -profiles: profiles-oscheck source-tips jdk hotspot profiles-only
    1.15 +profiles: source-tips jdk hotspot profiles-only
    1.16  profiles-only: start-make
    1.17  	@$(call TargetEnter)
    1.18  	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
    1.19  	@$(call TargetExit)
    1.20  
    1.21 -profiles-oscheck:
    1.22 -        ifneq ($(OPENJDK_TARGET_OS), linux)
    1.23 -	  @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
    1.24 -        endif
    1.25 -
    1.26  install: images install-only
    1.27  install-only: start-make
    1.28  	@$(call TargetEnter)
    1.29 @@ -240,7 +235,7 @@
    1.30  .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
    1.31  .PHONY: default all clean dist-clean bootcycle-images start-make
    1.32  .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
    1.33 -.PHONY: profiles profiles-only profiles-oscheck
    1.34 +.PHONY: profiles profiles-only
    1.35  
    1.36  include $(root_dir)/make/Jprt.gmk
    1.37  

mercurial