Print this page
9128 cw(1onbld) should be able to run multiple shadows
9129 file-locking tests shouldn't build multiple source files in one compiler invocation
9130 DTrace tst.gcc.d isn't useful
9132 cw(1onbld) shouldn't shadow pure preprocessing
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed? by: Yuri Pankov <yuripv@yuripv.net>
Reviewed? by: Robert Mustacchi <rm@joyent.com>
Reviewed? by: Jason King <jason.king@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile
          +++ new/usr/src/Makefile
↓ open down ↓ 233 lines elided ↑ open up ↑
 234  234  cscope.out tags: FRC
 235  235          $(XREF) -f -x $@
 236  236  
 237  237  FRC:
 238  238  
 239  239  #
 240  240  # Targets for reporting compiler versions; nightly uses these.
 241  241  #
 242  242  
 243  243  cc-version:
 244      -        @if $($(MACH)_CC) -_versions >/dev/null 2>/dev/null; then \
 245      -                $(ECHO) 32-bit compiler;                        \
 246      -                $(ECHO) $($(MACH)_CC);                          \
 247      -                $($(MACH)_CC) -_versions 2>&1 |                 \
 248      -                    $(EGREP) '^(cw|cc|gcc|primary|shadow)';     \
 249      -        else                                                    \
 250      -                __COMPILER=`$($(MACH)_CC) -_compiler 2>/dev/null || $(TRUE)`;\
 251      -                if [ -z "$$__COMPILER" ]; then                  \
 252      -                        $(ECHO) No 32-bit compiler found;       \
 253      -                        exit 1;                                 \
 254      -                else                                            \
 255      -                        $(ECHO) 32-bit compiler;                \
 256      -                        $(ECHO) $($(MACH)_CC);                  \
 257      -                        $(ECHO) $$__COMPILER;                   \
 258      -                        $($(MACH)_CC) -V 2>&1 | head -1;        \
 259      -                fi;                                             \
 260      -        fi
      244 +        @$(ECHO) 32-bit compiler;                       \
      245 +        $(ECHO) $($(MACH)_CC);                          \
      246 +        $(CW) --versions $(CW_CC_COMPILERS) 2>&1
 261  247  
 262  248  cc64-version:
 263      -        @if $($(MACH64)_CC) -_versions >/dev/null 2>/dev/null; then \
 264      -                $(ECHO) 64-bit compiler;                        \
 265      -                $(ECHO) $($(MACH64)_CC);                        \
 266      -                $($(MACH64)_CC) -_versions 2>&1 |               \
 267      -                    $(EGREP) '^(cw|cc|gcc|primary|shadow)';     \
 268      -        else                                                    \
 269      -                __COMPILER=`$($(MACH64)_CC) -_compiler 2>/dev/null || $(TRUE)`;\
 270      -                if [ -z "$$__COMPILER" ]; then                  \
 271      -                        $(ECHO) No 64-bit compiler found;       \
 272      -                        exit 1;                                 \
 273      -                else                                            \
 274      -                        $(ECHO) 64-bit compiler;                \
 275      -                        $(ECHO) $($(MACH64)_CC);                \
 276      -                        $(ECHO) $$__COMPILER;                   \
 277      -                        $($(MACH64)_CC) -V 2>&1 | head -1;      \
 278      -                fi;                                             \
 279      -        fi
      249 +        @$(ECHO) 64-bit compiler;                       \
      250 +        $(ECHO) $($(MACH)_CC);                          \
      251 +        $(CW) --versions $(CW_CC_COMPILERS) 2>&1
 280  252  
 281  253  java-version:
 282  254          @if [ -x "$(JAVAC)" ]; then                     \
 283  255                  $(ECHO) $(JAVAC);                       \
 284  256                  $(JAVA_ROOT)/bin/java -fullversion 2>&1 | head -1;      \
 285  257          else                                            \
 286  258                  $(ECHO) No Java compiler found;         \
 287  259                  exit 1;                                 \
 288  260          fi
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX