diff options
| -rw-r--r-- | etc/defaults/make.conf | 24 | ||||
| -rw-r--r-- | etc/make.conf | 24 | ||||
| -rw-r--r-- | share/examples/etc/make.conf | 24 | ||||
| -rw-r--r-- | share/mk/sys.mk | 8 |
4 files changed, 33 insertions, 47 deletions
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index a5f1ea5..8623e1f 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.11 1994/09/23 07:16:09 rgrimes Exp $ +# $Id: make.conf,v 1.12 1994/09/30 14:57:01 csgr Exp $ # # This file, if present, will be read by make (see /usr/share/mk/sys.mk). # It allows you to override macro definitions to make without changing @@ -11,11 +11,7 @@ # # One, and probably the most common, use could be: # -#CFLAGS= -O -m486 -pipe -# A lot of people report that -O2 works fine, but there are known -# bugs in gcc. -pipe will almost always speed up compilation if you -# have enough memory. -# +#CFLAGS= -O2 -m486 -pipe # # Another useful entry is # @@ -25,7 +21,7 @@ # # To compile and install the Sun libm instead of the default use: # -#WANT_MSUN= yes +WANT_MSUN= yes # # # If you have a FPU (i387, i486DX, Pentium), you can make @@ -61,17 +57,17 @@ #CCFPU= yes # # -# By default, this points to /usr/X386 for XFree86 releases 2.1 or earlier. -# If you have XFree86 3.0 or later, you will probably want to uncomment this: +# By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier. +# If you have a XFree86 from before 3.0 you want to uncomment this. # -#X11BASE= /usr/X11R6 +#X11BASE= /usr/X386 # # -# Build `cc' using a static internals library, rather than the default -# (dynamic) one. This makes the compilers run faster, but at a cost of -# about a megabyte of disk space for every language other than C. +# Build `cc' using a dynamic internals library, rather than the default +# (static) one. This makes the compilers run slower (10-15%), but saves +# quite some diskspace. # -#NO_SHARED_LIBCC_INT= faster_cc +#SHARED_LIBCC_INT= faster_cc # # # Kerberos IV diff --git a/etc/make.conf b/etc/make.conf index a5f1ea5..8623e1f 100644 --- a/etc/make.conf +++ b/etc/make.conf @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.11 1994/09/23 07:16:09 rgrimes Exp $ +# $Id: make.conf,v 1.12 1994/09/30 14:57:01 csgr Exp $ # # This file, if present, will be read by make (see /usr/share/mk/sys.mk). # It allows you to override macro definitions to make without changing @@ -11,11 +11,7 @@ # # One, and probably the most common, use could be: # -#CFLAGS= -O -m486 -pipe -# A lot of people report that -O2 works fine, but there are known -# bugs in gcc. -pipe will almost always speed up compilation if you -# have enough memory. -# +#CFLAGS= -O2 -m486 -pipe # # Another useful entry is # @@ -25,7 +21,7 @@ # # To compile and install the Sun libm instead of the default use: # -#WANT_MSUN= yes +WANT_MSUN= yes # # # If you have a FPU (i387, i486DX, Pentium), you can make @@ -61,17 +57,17 @@ #CCFPU= yes # # -# By default, this points to /usr/X386 for XFree86 releases 2.1 or earlier. -# If you have XFree86 3.0 or later, you will probably want to uncomment this: +# By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier. +# If you have a XFree86 from before 3.0 you want to uncomment this. # -#X11BASE= /usr/X11R6 +#X11BASE= /usr/X386 # # -# Build `cc' using a static internals library, rather than the default -# (dynamic) one. This makes the compilers run faster, but at a cost of -# about a megabyte of disk space for every language other than C. +# Build `cc' using a dynamic internals library, rather than the default +# (static) one. This makes the compilers run slower (10-15%), but saves +# quite some diskspace. # -#NO_SHARED_LIBCC_INT= faster_cc +#SHARED_LIBCC_INT= faster_cc # # # Kerberos IV diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index a5f1ea5..8623e1f 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.11 1994/09/23 07:16:09 rgrimes Exp $ +# $Id: make.conf,v 1.12 1994/09/30 14:57:01 csgr Exp $ # # This file, if present, will be read by make (see /usr/share/mk/sys.mk). # It allows you to override macro definitions to make without changing @@ -11,11 +11,7 @@ # # One, and probably the most common, use could be: # -#CFLAGS= -O -m486 -pipe -# A lot of people report that -O2 works fine, but there are known -# bugs in gcc. -pipe will almost always speed up compilation if you -# have enough memory. -# +#CFLAGS= -O2 -m486 -pipe # # Another useful entry is # @@ -25,7 +21,7 @@ # # To compile and install the Sun libm instead of the default use: # -#WANT_MSUN= yes +WANT_MSUN= yes # # # If you have a FPU (i387, i486DX, Pentium), you can make @@ -61,17 +57,17 @@ #CCFPU= yes # # -# By default, this points to /usr/X386 for XFree86 releases 2.1 or earlier. -# If you have XFree86 3.0 or later, you will probably want to uncomment this: +# By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier. +# If you have a XFree86 from before 3.0 you want to uncomment this. # -#X11BASE= /usr/X11R6 +#X11BASE= /usr/X386 # # -# Build `cc' using a static internals library, rather than the default -# (dynamic) one. This makes the compilers run faster, but at a cost of -# about a megabyte of disk space for every language other than C. +# Build `cc' using a dynamic internals library, rather than the default +# (static) one. This makes the compilers run slower (10-15%), but saves +# quite some diskspace. # -#NO_SHARED_LIBCC_INT= faster_cc +#SHARED_LIBCC_INT= faster_cc # # # Kerberos IV diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 4f9faca..b1e719e 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,5 +1,5 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 -# $Id: sys.mk,v 1.6 1994/09/07 06:52:25 rgrimes Exp $ +# $Id: sys.mk,v 1.7 1994/10/02 05:12:46 rgrimes Exp $ unix ?= We run FreeBSD, not UNIX. @@ -7,9 +7,7 @@ unix ?= We run FreeBSD, not UNIX. .LIBS: .a -# A few things need X11 so we might as well centralize it so that the -# transition to X11R6 is easier. -X11BASE ?= /usr/X386 +X11BASE ?= /usr/X11R6 AR ?= ar ARFLAGS ?= rl @@ -23,7 +21,7 @@ CC ?= cc .if ${MACHINE} == "sparc" CFLAGS ?= -O4 .else -CFLAGS ?= -O +CFLAGS ?= -O2 .endif CXX ?= c++ |
