36 lines
1.2 KiB
Text
36 lines
1.2 KiB
Text
$NetBSD: patch-ag,v 1.2 2004/05/26 16:22:26 marc Exp $
|
|
|
|
--- j2se/make/common/Defs-bsd.gmk.orig 2004-04-27 23:58:06.000000000 +0200
|
|
+++ j2se/make/common/Defs-bsd.gmk 2004-04-27 23:59:30.000000000 +0200
|
|
@@ -178,9 +178,9 @@
|
|
# DEVTOOLS_PATH is for other tools required for building (such as
|
|
# zip, etc.)
|
|
ifeq ($(TRUE_PLATFORM), NetBSD)
|
|
-DEVTOOLS_PATH = /usr/pkg/bin/
|
|
+DEVTOOLS_PATH = ${LOCALBASE}/bin/
|
|
else
|
|
-DEVTOOLS_PATH = /usr/local/bin/
|
|
+DEVTOOLS_PATH = ${LOCALBASE}/bin/
|
|
endif
|
|
# Allow the user to override the default value...
|
|
ifdef ALT_DEVTOOLS_PATH
|
|
@@ -328,7 +328,8 @@
|
|
#
|
|
LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
|
|
ifeq ($(TRUE_PLATFORM), NetBSD)
|
|
-LDFLAGS_COMMON += -Wl,-R $(LIBDIR)/$(LIBARCH)
|
|
+LDFLAGS_COMMON += -Wl,-rpath $(LIBDIR)/$(LIBARCH)
|
|
+LDFLAGS_COMMON += -Wl,-rpath %%JVM_HOME%%/jre/lib/$(LIBARCH)
|
|
endif
|
|
LDFLAGS_OPT =
|
|
LDFLAGS_DBG =
|
|
@@ -394,7 +395,8 @@
|
|
VM_NAME = server
|
|
JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME)
|
|
ifeq ($(TRUE_PLATFORM), NetBSD)
|
|
-LDFLAGS_COMMON += -Wl,-R $(LIBDIR)/$(LIBARCH)/$(VM_NAME)
|
|
+LDFLAGS_COMMON += -Wl,-rpath $(LIBDIR)/$(LIBARCH)/$(VM_NAME)
|
|
+LDFLAGS_COMMON += -Wl,-rpath %%JVM_HOME%%/jre/lib/$(LIBARCH)/$(VM_NAME)
|
|
endif
|
|
JVMLIB += -ljvm$(SUFFIX)
|
|
JAVALIB = -ljava$(SUFFIX) $(JVMLIB)
|