Be able to link against JDK 1.1 libraries.

This commit is contained in:
nicolson%netscape.com 2001-04-10 17:41:52 +00:00
Родитель 6ccb52de5e
Коммит b9d15e6921
1 изменённых файлов: 8 добавлений и 0 удалений

Просмотреть файл

@ -141,16 +141,24 @@ ifeq ($(OS_ARCH), SunOS)
# (3) specify "linker" information
JAVA_CPU = sparc
ifeq ($(JDK_VERSION), 1.1)
JAVA_LIBDIR = lib/$(JAVA_CPU)
else
JAVA_LIBDIR = jre/lib/$(JAVA_CPU)
endif
# ** IMPORTANT ** having -lthread before -lnspr is critical on solaris
# when linking with -ljava as nspr redefines symbols in libthread that
# cause JNI executables to fail with assert of bad thread stack values.
JAVA_CLIBS = -lthread
ifneq ($(JDK_VERSION), 1.1)
JAVA_LIBS = -L$(JAVA_HOME)/$(JAVA_LIBDIR)/$(JDK_THREADING_MODEL) -lhpi
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava
else
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/$(JDK_THREADING_MODEL) -ljava
endif
JAVA_LIBS += $(JAVA_CLIBS)
LDFLAGS += $(JAVA_LIBS)