зеркало из https://github.com/mozilla/pjs.git
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.
This commit is contained in:
Родитель
dd6b8a1e81
Коммит
26fa27cb5e
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче