Mercurial > illumos > onarm
changeset 7:e6287d1755ba
fix miscellaneous portion in Makefile.master.
| author | Koji Uno <koji.uno@sun.com> |
|---|---|
| date | Mon, 12 Apr 2010 13:22:44 +0900 |
| parents | 66ca4e7dba9b |
| children | d2a803ab280b |
| files | usr/src/Makefile.master |
| diffstat | 1 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/Makefile.master Thu Oct 15 14:04:56 2009 +0900 +++ b/usr/src/Makefile.master Mon Apr 12 13:22:44 2010 +0900 @@ -100,6 +100,7 @@ # set __GNUC= in the environment to build 32-bit with the gcc compiler. # The default is to use the Sun Studio compiler for all processor types. __GNUC= $(POUND_SIGN) +$(__GNUC)__NON_GNUC = $(POUND_SIGN) # set __GNUC64= in the environment to build 64-bit with the gcc compiler. # Inherit the __GNUC value by default, and if that is set to $(POUND_SIGN) @@ -119,6 +120,7 @@ __GNU_LD= $(POUND_SIGN) __GNULD= $(POUND_SIGN) $(__GNU_LD)__GNULD= +$(__GNULD)__NON_GNULD = $(POUND_SIGN) # CLOSED is the root of the tree that contains source which isn't released # as open source @@ -161,7 +163,6 @@ DD= /usr/bin/dd CP= /usr/bin/cp -f MCS= /usr/ccs/bin/mcs -ELFDUMP= /usr/ccs/bin/elfdump CAT= /usr/bin/cat ELFDUMP= /usr/ccs/bin/elfdump M4= /usr/ccs/bin/m4 @@ -169,7 +170,6 @@ LEX= /usr/ccs/bin/lex FLEX= $(SFW_ROOT)/bin/flex YACC= /usr/ccs/bin/yacc -NM= /usr/ccs/bin/nm CPP= /usr/lib/cpp JAVAC= $(JAVA_ROOT)/bin/javac JAVAH= $(JAVA_ROOT)/bin/javah @@ -506,6 +506,7 @@ sparcv9_IROPTFLAG = -W2,-xwrap_int i386_IROPTFLAG = amd64_IROPTFLAG = +arm_IROPTFLAG = IROPTFLAG = $($(MACH)_IROPTFLAG) IROPTFLAG64 = $($(MACH64)_IROPTFLAG) @@ -529,9 +530,12 @@ # Flags that are used to build parts of the code that are subsequently # run on the build machine (also known as the NATIVE_BUILD). # -NATIVE_CFLAGS= $(COPTFLAG) $($(NATIVE_MACH)_CFLAGS) $(CCMODE) \ +# NATIVE_CFLAGS= $(COPTFLAG) $($(NATIVE_MACH)_CFLAGS) $(CCMODE) \ +# $(ILDOFF) $(CERRWARN) $(C99MODE) $($(NATIVE_MACH)_CCUNBOUND) \ +# $(IROPTFLAG) $(CGLOBALSTATIC) +NATIVE_CFLAGS= $($(NATIVE_MACH)_COPTFLAG) $($(NATIVE_MACH)_CFLAGS) $(CCMODE) \ $(ILDOFF) $(CERRWARN) $(C99MODE) $($(NATIVE_MACH)_CCUNBOUND) \ - $(IROPTFLAG) $(CGLOBALSTATIC) + $($(NATIVE_MACH)_IROPTFLAG) $(CGLOBALSTATIC) DTEXTDOM=-DTEXT_DOMAIN=\"$(TEXT_DOMAIN)\" # For messaging. DTS_ERRNO=-D_TS_ERRNO @@ -1153,9 +1157,6 @@ @$(ECHO) "extracting code from $< ... " sed -n -e '/ONC_PLUS EXTRACT START/,/ONC_PLUS EXTRACT END/p' $< > $@ -$(__GNUC)__NON_GNUC = $(POUND_SIGN) -$(__GNULD)__NON_GNULD = $(POUND_SIGN) - STATIC_UNIX = $(POUND_SIGN) USE_UTSTUNE = $(POUND_SIGN)