comparison make/sun/font/Makefile @ 8640:d468376d877c

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Wed, 24 May 2017 00:32:01 -0700
parents 105d6ed3d7bd c28a0dbea537
children
comparison
equal deleted inserted replaced
39:78dc7f7b729d 41:a4d4a292a5e9
205 else 205 else
206 ifeq ($(PLATFORM), solaris) 206 ifeq ($(PLATFORM), solaris)
207 # Note that on Solaris, fontmanager is built against the headless library. 207 # Note that on Solaris, fontmanager is built against the headless library.
208 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/headless 208 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/headless
209 OTHER_LDLIBS += -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -lc $(LIBM) $(LIBCXX) 209 OTHER_LDLIBS += -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -lc $(LIBM) $(LIBCXX)
210 else
211 ifeq ($(PLATFORM), aix)
212 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/headless
213 OTHER_LDLIBS += -G -lawt -lc $(LIBM) $(LIBCXX)
210 else # PLATFORM is linux 214 else # PLATFORM is linux
211 OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX) 215 OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX)
212 ifeq ("$(CC_VER_MAJOR)", "3") 216 ifeq ("$(CC_VER_MAJOR)", "3")
213 OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic 217 OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
214 endif 218 endif
215 endif 219 endif
216 endif 220 endif
221 endif
217 222
218 endif # PLATFORM 223 endif # PLATFORM
219 224
220 # set up compile flags.. 225 # set up compile flags..
221 226
222 ifeq ($(PLATFORM), macosx)) 227 ifeq ($(PLATFORM), macosx)
223 CPPFLAGS += -I$(CLASSHDRDIR) 228 CPPFLAGS += -I$(CLASSHDRDIR)
224 endif 229 endif
225 230
226 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR) \ 231 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR) \
227 -I$(SHARE_SRC)/native/$(PKGDIR)/layout \ 232 -I$(SHARE_SRC)/native/$(PKGDIR)/layout \