Print this page
1681 support for BUILD64=# no longer works
*** 20,29 ****
--- 20,30 ----
#
#
# Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2012 by Delphix. All rights reserved.
+ # Copyright (c) 2014 Andrew Stormont.
#
#
# Makefile.master, global definitions for system source
#
*** 244,265 ****
#
# MACH64 is derived from MACH, and BUILD64 is set to `#' for
# architectures on which we do not build 64-bit versions.
# (There are no such architectures at the moment.)
#
! # Set BUILD64=# in the environment to disable 64-bit amd64
! # builds on i386 machines.
MACH64_1= $(MACH:sparc=sparcv9)
MACH64= $(MACH64_1:i386=amd64)
MACH32_1= $(MACH:sparc=sparcv7)
MACH32= $(MACH32_1:i386=i86)
! sparc_BUILD64=
! i386_BUILD64=
! BUILD64= $($(MACH)_BUILD64)
#
# C compiler mode. Future compilers may change the default on us,
# so force extended ANSI mode globally. Lower level makefiles can
# override this by setting CCMODE.
--- 245,269 ----
#
# MACH64 is derived from MACH, and BUILD64 is set to `#' for
# architectures on which we do not build 64-bit versions.
# (There are no such architectures at the moment.)
#
! # Set BUILD64=# in the environment to disable 64-bit builds.
MACH64_1= $(MACH:sparc=sparcv9)
MACH64= $(MACH64_1:i386=amd64)
MACH32_1= $(MACH:sparc=sparcv7)
MACH32= $(MACH32_1:i386=i86)
! BUILD64=
! sparc_BUILD64= $(POUND_SIGN)
! i386_BUILD64= $(POUND_SIGN)
! $($(MACH)_BUILD64)= $(BUILD64)
!
! NOT_BUILD64=
! $(BUILD64)NOT_BUILD64= $(POUND_SIGN)
#
# C compiler mode. Future compilers may change the default on us,
# so force extended ANSI mode globally. Lower level makefiles can
# override this by setting CCMODE.