< prev index next >

make/CopyImportModules.gmk

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2015, 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 # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2015, 2016, 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 # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this
*** 57,69 **** TARGETS += $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) else $(eval $(call SetupCopyFiles, COPY_LIBS, \ SRC := $(LIBS_DIR), \ DEST := $(JDK_OUTPUTDIR)/lib, \ ! FILES := $(call CacheFind, $(LIBS_DIR)), \ )) ! TARGETS += $(COPY_LIBS) endif endif ifneq ($(CMDS_DIR), ) $(eval $(call SetupCopyFiles, COPY_CMDS, \ --- 57,84 ---- TARGETS += $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) else $(eval $(call SetupCopyFiles, COPY_LIBS, \ SRC := $(LIBS_DIR), \ DEST := $(JDK_OUTPUTDIR)/lib, \ ! FILES := $(filter %$(SHARED_LIBRARY_SUFFIX), $(call CacheFind, $(LIBS_DIR))), \ )) ! ! # Use relative links if the import dir is inside the OUTPUT_ROOT, otherwise ! # copy to avoid having automated systems following symlinks when deleting files, ! # or risk invalidating the build output from external changes. ! ifeq ($(filter $(OUTPUT_ROOT)/%, $(LIBS_DIR)), ) ! LINK_MACRO := install-file ! else ! LINK_MACRO := link-file-relative ! endif ! $(eval $(call SetupCopyFiles, LINK_LIBS, \ ! SRC := $(LIBS_DIR), \ ! DEST := $(JDK_OUTPUTDIR)/lib, \ ! FILES := $(filter-out %$(SHARED_LIBRARY_SUFFIX), $(call CacheFind, $(LIBS_DIR))), \ ! MACRO := $(LINK_MACRO), \ ! )) ! TARGETS += $(COPY_LIBS) $(LINK_LIBS) endif endif ifneq ($(CMDS_DIR), ) $(eval $(call SetupCopyFiles, COPY_CMDS, \
< prev index next >