diff options
| author | sonja.mirtitsch%sun.com <devnull@localhost> | 2002-03-12 23:12:28 +0000 |
|---|---|---|
| committer | sonja.mirtitsch%sun.com <devnull@localhost> | 2002-03-12 23:12:28 +0000 |
| commit | 67c87211135cba8a1cfe1b221e23958bf65f3d11 (patch) | |
| tree | 5caea5eb52d13520ef15fcc788fc5771006dff34 | |
| parent | 5f05eb1967f47e74acac43ef015274b619b10254 (diff) | |
| parent | 213f433fbe34195e90955b8e4b9e705b776cc1b4 (diff) | |
| download | nss-hg-67c87211135cba8a1cfe1b221e23958bf65f3d11.tar.gz | |
sonmi, committing changes to find libraries for 64 bit Solaris build
| -rw-r--r-- | security/coreconf/jdk.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/security/coreconf/jdk.mk b/security/coreconf/jdk.mk index 79b8b7662..18043f733 100644 --- a/security/coreconf/jdk.mk +++ b/security/coreconf/jdk.mk @@ -139,7 +139,11 @@ ifeq ($(OS_ARCH), SunOS) INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH) # (3) specify "linker" information +ifeq ($(USE_64), 1) + JAVA_CPU = $(shell uname -p)v9 +else JAVA_CPU = $(shell uname -p) +endif ifeq ($(JDK_VERSION), 1.1) JAVA_LIBDIR = lib/$(JAVA_CPU) @@ -153,7 +157,11 @@ endif JAVA_CLIBS = -lthread ifneq ($(JDK_VERSION), 1.1) +ifeq ($(USE_64), 1) + JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server +else JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic +endif JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) JAVA_LIBS += -ljvm -ljava else @@ -396,6 +404,9 @@ ifeq ($(JDK_CLASSPATH_OPT),) JDK_CLASSPATH_OPT = -classpath $(JDK_CLASSPATH) endif +ifeq ($(USE_64), 1) + JDK_USE_64 = -d64 +endif endif @@ -437,6 +448,7 @@ ifeq ($(JAVA),) JAVA_FLAGS += $(JDK_DEBUG_OPT) JAVA_FLAGS += $(JDK_CLASSPATH_OPT) JAVA_FLAGS += $(JDK_JIT_OPT) + JAVA_FLAGS += $(JDK_USE_64) JAVA = $(JAVA_PROG) $(JAVA_FLAGS) endif @@ -451,6 +463,7 @@ ifeq ($(JAVAC),) JAVAC_FLAGS += $(JDK_DEBUG_OPT) JAVAC_FLAGS += $(JDK_CLASSPATH_OPT) JAVAC_FLAGS += $(JDK_CLASS_REPOSITORY_OPT) + JAVAC_FLAGS += $(JDK_USE_64) JAVAC = $(JAVAC_PROG) $(JAVAC_FLAGS) endif |