equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
144 |
144 |
145 ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), ) |
145 ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), ) |
146 BUILD_JSPAWNHELPER := 1 |
146 BUILD_JSPAWNHELPER := 1 |
147 endif |
147 endif |
148 |
148 |
149 ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
150 BUILD_JSPAWNHELPER_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base |
|
151 endif |
|
152 |
|
153 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
149 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
154 BUILD_JSPAWNHELPER_LDFLAGS += $(COMPILER_TARGET_BITS_FLAG)64 |
150 BUILD_JSPAWNHELPER_LDFLAGS += $(COMPILER_TARGET_BITS_FLAG)64 |
155 endif |
151 endif |
156 |
152 |
157 ifeq ($(BUILD_JSPAWNHELPER), 1) |
153 ifeq ($(BUILD_JSPAWNHELPER), 1) |