diff options
| author | glen.beasley%sun.com <devnull@localhost> | 2002-05-02 04:37:16 +0000 |
|---|---|---|
| committer | glen.beasley%sun.com <devnull@localhost> | 2002-05-02 04:37:16 +0000 |
| commit | f002a441ea5ca5d45c76ff000555a0bc84737d86 (patch) | |
| tree | 8144cc4ec71d0d2f50981f405d8aece5f15392b3 | |
| parent | c44260bed05f8da9815736a5dbe6b3c829c56edf (diff) | |
| download | nss-hg-f002a441ea5ca5d45c76ff000555a0bc84737d86.tar.gz | |
bug 131308 build 64 bit JSS with JDK 1.4
| -rw-r--r-- | security/coreconf/jdk.mk | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/security/coreconf/jdk.mk b/security/coreconf/jdk.mk index 9e0151023..8189808c8 100644 --- a/security/coreconf/jdk.mk +++ b/security/coreconf/jdk.mk @@ -118,7 +118,7 @@ ifeq ($(OS_ARCH), WINNT) endif # set [Sun Solaris] platforms -ifeq ($(OS_TARGET), SunOS) +ifeq ($(OS_ARCH), SunOS) JAVA_CLASSES = $(JAVA_HOME)/lib/classes.zip ifeq ($(JRE_HOME),) @@ -139,7 +139,11 @@ ifeq ($(OS_TARGET), 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 @@ -168,7 +176,7 @@ endif endif # set [Hewlett Packard HP-UX] platforms -ifeq ($(OS_TARGET), HP-UX) +ifeq ($(OS_ARCH), HP-UX) JAVA_CLASSES = $(JAVA_HOME)/lib/classes.zip ifeq ($(JRE_HOME),) @@ -207,7 +215,7 @@ ifeq ($(OS_TARGET), HP-UX) endif # set [Redhat Linux] platforms -ifeq ($(OS_TARGET), Linux) +ifeq ($(OS_ARCH), Linux) JAVA_CLASSES = $(JAVA_HOME)/lib/classes.zip ifeq ($(JRE_HOME),) @@ -235,7 +243,11 @@ ifeq ($(OS_TARGET), Linux) JAVA_CLIBS = JAVA_LIBS = -L$(JAVA_HOME)/$(JAVA_LIBDIR)/$(JDK_THREADING_MODEL) -lhpi - JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm + ifeq ($(JDK_VERSION), 1.4) + JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server -ljvm + else + JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm + endif JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava JAVA_LIBS += $(JAVA_CLIBS) @@ -246,7 +258,7 @@ ifeq ($(OS_TARGET), Linux) endif # set [IBM AIX] platforms -ifeq ($(OS_TARGET), AIX) +ifeq ($(OS_ARCH), AIX) JAVA_CLASSES = $(JAVA_HOME)/lib/classes.zip ifeq ($(JRE_HOME),) @@ -285,7 +297,7 @@ ifeq ($(OS_TARGET), AIX) endif # set [Digital UNIX] platforms -ifeq ($(OS_TARGET), OSF1) +ifeq ($(OS_ARCH), OSF1) JAVA_CLASSES = $(JAVA_HOME)/lib/classes.zip ifeq ($(JRE_HOME),) @@ -324,7 +336,7 @@ ifeq ($(OS_TARGET), OSF1) endif # set [Silicon Graphics IRIX] platforms -ifeq ($(OS_TARGET), IRIX) +ifeq ($(OS_ARCH), IRIX) JAVA_CLASSES = $(JAVA_HOME)/lib/dev.jar:$(JAVA_HOME)/lib/rt.jar ifeq ($(JRE_HOME),) @@ -396,6 +408,9 @@ ifeq ($(JDK_CLASSPATH_OPT),) JDK_CLASSPATH_OPT = -classpath $(JDK_CLASSPATH) endif +ifeq ($(USE_64), 1) + JDK_USE_64 = -d64 +endif endif @@ -437,6 +452,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 +467,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 |