1.1 --- a/make/solaris/makefiles/defs.make Fri Apr 12 12:22:59 2013 -0700 1.2 +++ b/make/solaris/makefiles/defs.make Fri Apr 12 15:53:30 2013 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 # 1.5 -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. 1.6 +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. 1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 # 1.9 # This code is free software; you can redistribute it and/or modify it 1.10 @@ -19,7 +19,7 @@ 1.11 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 1.12 # or visit www.oracle.com if you need additional information or have any 1.13 # questions. 1.14 -# 1.15 +# 1.16 # 1.17 1.18 # The common definitions for hotspot solaris builds. 1.19 @@ -172,9 +172,6 @@ 1.20 # Library suffix 1.21 LIBRARY_SUFFIX=so 1.22 1.23 -# FIXUP: The subdirectory for a debug build is NOT the same on all platforms 1.24 -VM_DEBUG=jvmg 1.25 - 1.26 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 1.27 1.28 # client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX) 1.29 @@ -221,8 +218,8 @@ 1.30 endif 1.31 ifeq ($(JVM_VARIANT_CLIENT),true) 1.32 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 1.33 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 1.34 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 1.35 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 1.36 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 1.37 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) 1.38 ifeq ($(ARCH_DATA_MODEL),32) 1.39 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) 1.40 @@ -257,4 +254,4 @@ 1.41 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo 1.42 endif 1.43 endif 1.44 -EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 1.45 +EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar