diff options
| author | wtchang%redhat.com <devnull@localhost> | 2005-10-18 22:36:19 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2005-10-18 22:36:19 +0000 |
| commit | ec9768aa5dfd0d58cd7be22f255ba9d9b80f6016 (patch) | |
| tree | d569f785443deb1917c2daaf03d2b20ee9610240 | |
| parent | 611019f2b6ec574705f535600a01730599ba1ef7 (diff) | |
| download | nss-hg-ec9768aa5dfd0d58cd7be22f255ba9d9b80f6016.tar.gz | |
Bugzilla bug 312774: support building with IBM JDK on Linux. Added -L
linker flags for IBM JDK's pathnames. The patch is contributed by Rich
Megginson of Red Hat. r=wtc,glen.beasley.
| -rw-r--r-- | security/coreconf/jdk.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/security/coreconf/jdk.mk b/security/coreconf/jdk.mk index f2656c0ac..e4936ac2c 100644 --- a/security/coreconf/jdk.mk +++ b/security/coreconf/jdk.mk @@ -250,15 +250,23 @@ ifeq ($(OS_ARCH), Linux) JAVA_CPU = i386 endif endif + + # Sun JDK JAVA_LIBDIR = jre/lib/$(JAVA_CPU) + # IBM JDK + IBM_JAVA_LIBDIR = jre/bin JAVA_CLIBS = ifeq ($(JDK_VERSION), 1.4) - JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server -ljvm + JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/server \ + -L$(JAVA_HOME)/$(IBM_JAVA_LIBDIR)/classic \ + -ljvm endif - JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava + JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) \ + -L$(JAVA_HOME)/$(IBM_JAVA_LIBDIR) \ + -ljava JAVA_LIBS += $(JAVA_CLIBS) LDFLAGS += $(JAVA_LIBS) |