equal
deleted
inserted
replaced
83 LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli |
83 LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli |
84 LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli |
84 LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli |
85 endif |
85 endif |
86 endif |
86 endif |
87 ifeq ($(PLATFORM), linux) |
87 ifeq ($(PLATFORM), linux) |
88 LDFLAGS += -z origin |
88 LDFLAGS += -Wl,-z -Wl,origin |
89 LDFLAGS += -Wl,--allow-shlib-undefined |
89 LDFLAGS += -Wl,--allow-shlib-undefined |
90 LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli |
90 LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli |
91 LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli |
91 LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli |
92 endif |
92 endif |
93 endif |
93 endif |
277 $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$(OBJDIR)/main.$(OBJECT_SUFFIX) \ |
277 $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$(OBJDIR)/main.$(OBJECT_SUFFIX) \ |
278 $(VERSION_DEFINES) $< |
278 $(VERSION_DEFINES) $< |
279 |
279 |
280 # |
280 # |
281 # How to install jvm.cfg. |
281 # How to install jvm.cfg. |
282 # |
282 # |
283 $(JVMCFG): $(LAUNCHER_PLATFORM_SRC)/bin/$(ARCH)/jvm.cfg |
283 ifeq ($(ZERO_BUILD), true) |
|
284 JVMCFG_ARCH = zero |
|
285 else |
|
286 JVMCFG_ARCH = $(ARCH) |
|
287 endif |
|
288 |
|
289 $(JVMCFG): $(LAUNCHER_PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg |
284 $(install-file) |
290 $(install-file) |
285 |
291 |
286 # |
292 # |
287 # Default dependencies |
293 # Default dependencies |
288 # |
294 # |