Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 92882: coreconf jdk.mk doesn't support solaris x86

Browse Source 
r=wtc.


git-svn-id: svn://10.0.0.236/trunk@100027 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nicolson%netscape.com
2001-07-31 18:58:49 +00:00
parent 293121a2f9
commit 24e199829c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/security/coreconf/jdk.mk
View File

@@ -139,7 +139,7 @@ ifeq ($(OS_ARCH), SunOS)
INCLUDES += -I$(JAVA_HOME)/include/$(JAVA_ARCH)
# (3) specify "linker" information
JAVA_CPU = sparc
JAVA_CPU = $(shell uname -p)
ifeq ($(JDK_VERSION), 1.1)
JAVA_LIBDIR = lib/$(JAVA_CPU)
@@ -153,8 +153,9 @@ endif
JAVA_CLIBS = -lthread
ifneq ($(JDK_VERSION), 1.1)
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic -ljvm
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR) -ljava
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/classic
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)
JAVA_LIBS += -ljvm -ljava
else
JAVA_LIBS += -L$(JAVA_HOME)/$(JAVA_LIBDIR)/$(JDK_THREADING_MODEL) -ljava
endif