comparison make/solaris/makefiles/vm.make @ 15280:417e2ae45b89

Merge
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Tue, 22 Apr 2014 18:22:40 -0700
parents cc844a4512f1
children dffc37fa7157
comparison
equal deleted inserted replaced
15279:0c6d8a08e31b 15280:417e2ae45b89
1 # 1 #
2 # Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 1998, 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. 7 # published by the Free Software Foundation.
97 97
98 # Large File Support 98 # Large File Support
99 ifneq ($(LP64), 1) 99 ifneq ($(LP64), 1)
100 CXXFLAGS/ostream.o += -D_FILE_OFFSET_BITS=64 100 CXXFLAGS/ostream.o += -D_FILE_OFFSET_BITS=64
101 endif # ifneq ($(LP64), 1) 101 endif # ifneq ($(LP64), 1)
102
103 ifeq ($(INCLUDE_GRAAL), true)
104 CXXFLAGS += -DGRAAL_VERSION="\"$(GRAAL_VERSION)\""
105 endif
102 106
103 # CFLAGS_WARN holds compiler options to suppress/enable warnings. 107 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
104 CFLAGS += $(CFLAGS_WARN) 108 CFLAGS += $(CFLAGS_WARN)
105 109
106 # Do not use C++ exception handling 110 # Do not use C++ exception handling