Print this page
1681 support for BUILD64=# no longer works

Split Close
Expand all
Collapse all
          --- old/usr/src/Makefile.master
          +++ new/usr/src/Makefile.master
↓ open down ↓ 14 lines elided ↑ open up ↑
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright (c) 2012 by Delphix. All rights reserved.
       25 +# Copyright (c) 2014 Andrew Stormont.
  25   26  #
  26   27  
  27   28  #
  28   29  # Makefile.master, global definitions for system source
  29   30  #
  30   31  ROOT=           /proto
  31   32  
  32   33  #
  33   34  # Adjunct root, containing an additional proto area to be used for headers
  34   35  # and libraries.
↓ open down ↓ 204 lines elided ↑ open up ↑
 239  240  #
 240  241  INS.pyfile=     $(INS.file); $(TOUCH) -r $< $@
 241  242  
 242  243  # MACH must be set in the shell environment per uname -p on the build host
 243  244  # More specific architecture variables should be set in lower makefiles.
 244  245  #
 245  246  # MACH64 is derived from MACH, and BUILD64 is set to `#' for
 246  247  # architectures on which we do not build 64-bit versions.
 247  248  # (There are no such architectures at the moment.)
 248  249  #
 249      -# Set BUILD64=# in the environment to disable 64-bit amd64
 250      -# builds on i386 machines.
      250 +# Set BUILD64=# in the environment to disable 64-bit builds.
 251  251  
 252  252  MACH64_1=       $(MACH:sparc=sparcv9)
 253  253  MACH64=         $(MACH64_1:i386=amd64)
 254  254  
 255  255  MACH32_1=       $(MACH:sparc=sparcv7)
 256  256  MACH32=         $(MACH32_1:i386=i86)
 257  257  
 258      -sparc_BUILD64=
 259      -i386_BUILD64=
 260      -BUILD64=        $($(MACH)_BUILD64)
      258 +BUILD64=
      259 +sparc_BUILD64=  $(POUND_SIGN)
      260 +i386_BUILD64=   $(POUND_SIGN)
      261 +$($(MACH)_BUILD64)=     $(BUILD64)
      262 +
      263 +NOT_BUILD64=
      264 +$(BUILD64)NOT_BUILD64=  $(POUND_SIGN)
 261  265  
 262  266  #
 263  267  # C compiler mode. Future compilers may change the default on us,
 264  268  # so force extended ANSI mode globally. Lower level makefiles can
 265  269  # override this by setting CCMODE.
 266  270  #
 267  271  CCMODE=                 -Xa
 268  272  CCMODE64=               -Xa
 269  273  
 270  274  #
↓ open down ↓ 888 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX