diff options
| author | Richard PALO <richard@NetBSD.org> | 2015-05-01 17:08:40 +0200 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2015-05-31 13:04:58 -0400 |
| commit | e53cbaa96c466c221cfec0d1a481c6f75be6880d (patch) | |
| tree | 8dd5b3a6750e272c8c363280e05263b29313d15f /usr/src | |
| parent | d235eb05fe584753047218e3a6dd344d0154d19b (diff) | |
| download | illumos-joyent-e53cbaa96c466c221cfec0d1a481c6f75be6880d.tar.gz | |
5851 usr/lib/pool/poold has incorrect run path after 4719
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/Makefile.master | 3 | ||||
| -rw-r--r-- | usr/src/cmd/pools/poold/Makefile | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index 4d40de81a9..2330d3194a 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -113,6 +113,9 @@ CLOSED= $(SRC)/../closed BUILD_TOOLS= /ws/onnv-tools ONBLD_TOOLS= $(BUILD_TOOLS)/onbld +# define runtime JAVA_HOME, primarily for cmd/pools/poold +JAVA_HOME= /usr/java +# define buildtime JAVA_ROOT JAVA_ROOT= /usr/java GCC_ROOT= /opt/gcc/4.4.4 diff --git a/usr/src/cmd/pools/poold/Makefile b/usr/src/cmd/pools/poold/Makefile index 1ca87a6111..814fa34c09 100644 --- a/usr/src/cmd/pools/poold/Makefile +++ b/usr/src/cmd/pools/poold/Makefile @@ -74,7 +74,8 @@ INCS = -I../common \ -I$(JAVA_ROOT)/include \ -I$(JAVA_ROOT)/include/solaris LDLIBS += -lpool -L$(JAVA_ROOT)/jre/lib/$(MACH)/client -ljvm -LDFLAGS += -R$(JAVA_ROOT)/jre/lib/$(MACH)/client +# runpath should point to runtime JAVA_HOME +LDFLAGS += -R$(JAVA_HOME)/jre/lib/$(MACH)/client LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2 LINTLIBS += -L$(ROOTLIB) -lpool |