Mercurial > hg > openjdk > jigsaw > corba
changeset 147:74668f4f6bea jigsaw-b02
SKIP_BOOT_CYCLE=false to use jdk-module-image for modules build
Summary: Add -L lib/<arch> to look for native libraries
Reviewed-by: ohair
| author | mchung |
|---|---|
| date | Fri, 02 Apr 2010 23:03:45 -0700 |
| parents | a87bdb5ecdfe |
| children | 4a3fb3218e31 |
| files | make/common/Defs-linux.gmk make/common/Defs-solaris.gmk make/sun/corba/core/Makefile |
| diffstat | 3 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Defs-linux.gmk Wed Feb 24 16:18:25 2010 -0800 +++ b/make/common/Defs-linux.gmk Fri Apr 02 23:03:45 2010 -0700 @@ -259,8 +259,12 @@ # the library itself should not. # VM_NAME = server -JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm -JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB) +# +# Native libraries are in: +# - the lib/<arch> directory for the modules image +# - the jre/lib/<arch> directory for the legacy image +JVMLIB = -L$(BOOTDIR)/lib/$(LIBARCH)/$(VM_NAME) -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm +JAVALIB = -L$(BOOTDIR)/lib/$(LIBARCH) -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB) # # We want to privatize JVM symbols on Solaris. This is so the user can
--- a/make/common/Defs-solaris.gmk Wed Feb 24 16:18:25 2010 -0800 +++ b/make/common/Defs-solaris.gmk Fri Apr 02 23:03:45 2010 -0700 @@ -564,7 +564,11 @@ # the library itself should not. # VM_NAME = server -JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/server -ljvm +# +# Native libraries are in: +# - the lib/<arch> directory for the modules image +# - the jre/lib/<arch> directory for the legacy image +JVMLIB = -L$(BOOTDIR)/lib/$(LIBARCH)/server -L$(BOOTDIR)/jre/lib/$(LIBARCH)/server -ljvm JAVALIB = # Part of INCREMENTAL_BUILD mechanism.
--- a/make/sun/corba/core/Makefile Wed Feb 24 16:18:25 2010 -0800 +++ b/make/sun/corba/core/Makefile Fri Apr 02 23:03:45 2010 -0700 @@ -52,7 +52,11 @@ ifdef STANDALONE_CORBA_WS # FIXUP: What is this all about? -OTHER_LDFLAGS=-L$(BOOTDIR)/jre/lib/$(ARCH) -L$(BOOTDIR)/jre/lib/$(LIBARCH)/native_threads -ljvm +# Native libraries are in: +# - the lib/<arch> directory for the modules image +# - the jre/lib/<arch> directory for the legacy image +OTHER_LDFLAGS=-L$(BOOTDIR)/lib/$(ARCH) +OTHER_LDFLAGS+=-L$(BOOTDIR)/jre/lib/$(ARCH) -L$(BOOTDIR)/jre/lib/$(LIBARCH)/native_threads -ljvm OTHER_INCLUDES+=-ICClassHeaders -I$(BOOTDIR)/include -I$(BOOTDIR)/include/$(PLATFORM) else OTHER_LDLIBS=$(JVMLIB)