diff options
author | phk <phk@FreeBSD.org> | 1994-11-07 04:18:04 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1994-11-07 04:18:04 +0000 |
commit | 5f6647840143c772181884a1aabb18ec92c35155 (patch) | |
tree | ebb48ae50fcb8c73cde90b647e80031bc1873e08 /etc | |
parent | 7b78e3a2326ad209194b5303d7662c996f0c0fdd (diff) | |
download | FreeBSD-src-5f6647840143c772181884a1aabb18ec92c35155.zip FreeBSD-src-5f6647840143c772181884a1aabb18ec92c35155.tar.gz |
Update make.conf and sys.mk to reflect the most recent advances in
civilization: Use -O2 and MSUN as default, and X11 is in /usr/X11R6
Diffstat (limited to 'etc')
-rw-r--r-- | etc/defaults/make.conf | 24 | ||||
-rw-r--r-- | etc/make.conf | 24 |
2 files changed, 20 insertions, 28 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 |