summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2005-10-27 20:11:54 +0000
committerwtchang%redhat.com <devnull@localhost>2005-10-27 20:11:54 +0000
commit9bfa3e4af4b68c88fe165f820faf0ab982a864ec (patch)
treeb38646c122f9b12d83e3b83d5497e5dff1faf875
parent3e56a6b42b4718f32aa29c6be7347664cc9fc3ba (diff)
downloadnss-hg-9bfa3e4af4b68c88fe165f820faf0ab982a864ec.tar.gz
JDK 1.4 on HP-UX doesn't have the "classic" JVM and only has the "server"
JVM. Tag: JSS_3_X_BRANCH
-rw-r--r--security/coreconf/jdk.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/security/coreconf/jdk.mk b/security/coreconf/jdk.mk
index d5403604a..7c3994934 100644
--- a/security/coreconf/jdk.mk
+++ b/security/coreconf/jdk.mk
@@ -208,7 +208,11 @@ ifeq ($(OS_ARCH), HP-UX)
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)