comparison make/linux/makefiles/saproc.make @ 23286:dd9cc155639c

Merge with jdk8u66-b17
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Thu, 07 Jan 2016 17:28:46 +0100
parents 89152779163c ddce0b7cee93
children
comparison
equal deleted inserted replaced
22786:ac649db7fec4 23286:dd9cc155639c
1 # 1 #
2 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2005, 2015, 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. 7 # published by the Free Software Foundation.
67 BUILDLIBSAPROC = $(LIBSAPROC) 67 BUILDLIBSAPROC = $(LIBSAPROC)
68 endif 68 endif
69 endif 69 endif
70 70
71 ifneq ($(ALT_SASRCDIR),) 71 ifneq ($(ALT_SASRCDIR),)
72 ALT_SAINCDIR=-I$(ALT_SASRCDIR) 72 ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR
73 else 73 else
74 ALT_SAINCDIR= 74 ALT_SAINCDIR=
75 endif 75 endif
76 SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) 76 SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
77
78 SAARCH ?= $(BUILDARCH)
77 79
78 $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE) 80 $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
79 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ 81 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
80 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ 82 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
81 exit 1; \ 83 exit 1; \
82 fi 84 fi
83 @echo Making SA debugger back-end... 85 @echo Making SA debugger back-end...
84 $(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \ 86 $(QUIETLY) $(CC) -D$(SAARCH) -D_GNU_SOURCE \
85 -D_FILE_OFFSET_BITS=64 \ 87 -D_FILE_OFFSET_BITS=64 \
86 $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ 88 $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
87 -I$(SASRCDIR) \ 89 -I$(SASRCDIR) \
88 -I$(GENERATED) \ 90 -I$(GENERATED) \
89 -I$(BOOT_JAVA_HOME)/include \ 91 -I$(BOOT_JAVA_HOME)/include \