Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/bsd/makefiles/universal.gmk	Wed May 21 10:54:59 2014 -0700
     1.2 +++ b/make/bsd/makefiles/universal.gmk	Mon Jun 02 13:12:01 2014 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2006, 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 @@ -74,19 +74,21 @@
    1.11  
    1.12  
    1.13  # Replace arch specific binaries with universal binaries
    1.14 +# Do not touch jre/lib/{client,server}/libjsig.$(LIBRARY_SUFFIX)
    1.15 +# That symbolic link belongs to the 'jdk' build.
    1.16  export_universal:
    1.17  	$(RM) -r $(EXPORT_PATH)/jre/lib/{i386,amd64}
    1.18  	$(RM) -r $(JDK_IMAGE_DIR)/jre/lib/{i386,amd64}
    1.19 -	$(RM) $(JDK_IMAGE_DIR)/jre/lib/{client,server}/libjsig.$(LIBRARY_SUFFIX)
    1.20  	($(CD) $(EXPORT_PATH) && \
    1.21  	  $(TAR) -cf - *) | \
    1.22  	  ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xpf -)
    1.23  
    1.24  
    1.25  # Overlay universal binaries
    1.26 +# Do not touch jre/lib/{client,server}/libjsig.$(LIBRARY_SUFFIX)
    1.27 +# That symbolic link belongs to the 'jdk' build.
    1.28  copy_universal:
    1.29  	$(RM) -r $(JDK_IMAGE_DIR)$(COPY_SUBDIR)/jre/lib/{i386,amd64}
    1.30 -	$(RM) $(JDK_IMAGE_DIR)$(COPY_SUBDIR)/jre/lib/{client,server}/libjsig.$(LIBRARY_SUFFIX)
    1.31  	($(CD) $(EXPORT_PATH)$(COPY_SUBDIR) && \
    1.32  	  $(TAR) -cf - *) | \
    1.33  	  ($(CD) $(JDK_IMAGE_DIR)$(COPY_SUBDIR) && $(TAR) -xpf -)