comparison make/common/Program.gmk @ 6681:2cc729dda2f8

Merge
author asaha
date Tue, 25 Jun 2013 17:20:25 -0700
parents 0bf72cc56dc3 fc52d0a1fcda
children 49b0ce28e2ca
comparison
equal deleted inserted replaced
26:919692362fc7 27:d91cac109e63
89 LDFLAGS += -Wl,-all_load 89 LDFLAGS += -Wl,-all_load
90 endif # ARCH 90 endif # ARCH
91 LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a 91 LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
92 92
93 ifeq ($(SYSTEM_ZLIB),true) 93 ifeq ($(SYSTEM_ZLIB),true)
94 OTHER_LDLIBS += -lz 94 OTHER_LDLIBS += $(ZLIB_LIBS)
95 endif # SYSTEM_ZLIB 95 endif # SYSTEM_ZLIB
96 endif # PLATFORM 96 endif # PLATFORM
97 97
98 ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems 98 ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems
99 LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli 99 LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli