jdk/make/common/Program.gmk

Print this page

        

*** 97,114 **** ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli OTHER_LDLIBS += -ljli ifeq ($(PLATFORM), solaris) ! ifeq ($(ARCH_DATA_MODEL), 32) LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli ! else ! LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli ! LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli endif - endif ifeq ($(PLATFORM), linux) LDFLAGS += $(LDFLAG_Z_ORIGIN) LDFLAGS += -Wl,--allow-shlib-undefined LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli --- 97,115 ---- ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli OTHER_LDLIBS += -ljli ifeq ($(PLATFORM), solaris) ! ## Temporarily remove for Modules Solaris 64bit only build ! #ifeq ($(ARCH_DATA_MODEL), 32) LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli ! #else ! # LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli ! # LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli ! #endif endif ifeq ($(PLATFORM), linux) LDFLAGS += $(LDFLAG_Z_ORIGIN) LDFLAGS += -Wl,--allow-shlib-undefined LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli