Print this page
4719 Common patchset for jdk1.7 support preparation

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile.master
          +++ new/usr/src/Makefile.master
↓ open down ↓ 546 lines elided ↑ open up ↑
 547  547  
 548  548  DTEXTDOM=-DTEXT_DOMAIN=\"$(TEXT_DOMAIN)\"       # For messaging.
 549  549  DTS_ERRNO=-D_TS_ERRNO
 550  550  CPPFLAGS.master=$(DTEXTDOM) $(DTS_ERRNO) \
 551  551          $(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) $(ENVCPPFLAGS4) \
 552  552          $(ADJUNCT_PROTO:%=-I%/usr/include)
 553  553  CPPFLAGS.native=$(ENVCPPFLAGS1) $(ENVCPPFLAGS2) $(ENVCPPFLAGS3) \
 554  554                  $(ENVCPPFLAGS4) -I$(NATIVE_ADJUNCT)/include
 555  555  CPPFLAGS=       $(CPPFLAGS.master)
 556  556  AS_CPPFLAGS=    $(CPPFLAGS.master)
 557      -JAVAFLAGS=      -deprecation
      557 +JAVAFLAGS=      -source 1.6 -target 1.6 -Xlint:deprecation,-options
 558  558  
 559  559  #
 560  560  # For source message catalogue
 561  561  #
 562  562  .SUFFIXES: $(SUFFIXES) .i .po
 563  563  MSGROOT= $(ROOT)/catalog
 564  564  MSGDOMAIN= $(MSGROOT)/$(TEXT_DOMAIN)
 565  565  MSGDOMAINPOFILE = $(MSGDOMAIN)/$(POFILE)
 566  566  DCMSGDOMAIN= $(MSGROOT)/LC_TIME/$(TEXT_DOMAIN)
 567  567  DCMSGDOMAINPOFILE = $(DCMSGDOMAIN)/$(DCFILE:.dc=.po)
↓ open down ↓ 591 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX