1 # |
1 # |
2 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2011, 2013, 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 |
624 BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/solaris/native/java/lang |
624 BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/solaris/native/java/lang |
625 BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) |
625 BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) |
626 LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o |
626 LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o |
627 LINK_JSPAWNHELPER_FLAGS := |
627 LINK_JSPAWNHELPER_FLAGS := |
628 |
628 |
629 ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris), ) |
629 ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), ) |
630 BUILD_JSPAWNHELPER := 1 |
630 BUILD_JSPAWNHELPER := 1 |
631 endif |
631 endif |
632 |
632 |
633 ifeq ($(OPENJDK_TARGET_OS), macosx) |
633 ifeq ($(OPENJDK_TARGET_OS), macosx) |
634 BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib |
634 BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib |
635 endif |
635 endif |
636 |
636 |
637 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
637 ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) |
638 LINK_JSPAWNHELPER_FLAGS += -m64 |
638 LINK_JSPAWNHELPER_FLAGS += $(COMPILER_TARGET_BITS_FLAG)64 |
639 endif |
639 endif |
640 |
640 |
641 ifeq ($(BUILD_JSPAWNHELPER), 1) |
641 ifeq ($(BUILD_JSPAWNHELPER), 1) |
642 $(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER, \ |
642 $(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER, \ |
643 SRC := $(BUILD_JSPAWNHELPER_SRC), \ |
643 SRC := $(BUILD_JSPAWNHELPER_SRC), \ |