summaryrefslogtreecommitdiff
path: root/usr/src/Makefile.master
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/Makefile.master')
-rw-r--r--usr/src/Makefile.master20
1 files changed, 11 insertions, 9 deletions
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 9ddb147e7d..9a926c7fbf 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -160,6 +160,7 @@ VTFONTCVT= $(ONBLD_TOOLS)/bin/$(MACH)/vtfontcvt
ECHO= echo
TRUE= true
INS= $(ONBLD_TOOLS)/bin/$(MACH)/install
+ED= /usr/bin/ed
SYMLINK= /usr/bin/ln -s
LN= /usr/bin/ln
MKDIR= /usr/bin/mkdir
@@ -167,7 +168,7 @@ CHMOD= /usr/bin/chmod
MV= /usr/bin/mv -f
RM= /usr/bin/rm -f
CUT= /usr/bin/cut
-NM= /usr/ccs/bin/nm
+NM= /usr/bin/nm
DIFF= /usr/bin/diff
GREP= /usr/bin/grep
EGREP= /usr/bin/egrep
@@ -176,17 +177,18 @@ KSH93= /usr/bin/ksh93
SED= /usr/bin/sed
AWK= /usr/bin/nawk
CP= /usr/bin/cp -f
-MCS= /usr/ccs/bin/mcs
+MCS= /usr/bin/mcs
CAT= /usr/bin/cat
-ELFDUMP= /usr/ccs/bin/elfdump
+ELFDUMP= /usr/bin/elfdump
M4= /usr/bin/m4
GM4= /usr/bin/gm4
-STRIP= /usr/ccs/bin/strip
-LEX= /usr/ccs/bin/lex
+STRIP= /usr/bin/strip
+LEX= /usr/bin/lex
FLEX= /usr/bin/flex
-YACC= /usr/ccs/bin/yacc
+YACC= /usr/bin/yacc
BISON= /usr/bin/bison
CPP= /usr/lib/cpp
+SH= /usr/bin/sh
ANSI_CPP= $(GNUC_ROOT)/bin/cpp
JAVAC= $(JAVA_ROOT)/bin/javac
JAVADOC= $(JAVA_ROOT)/bin/javadoc
@@ -936,7 +938,7 @@ CW= $(ONBLD_TOOLS)/bin/$(MACH)/cw
BUILD_CC= $(CW) $(CW_LINKER) $(CW_CC_COMPILERS) --
BUILD_CCC= $(CW) -C $(CW_LINKER) $(CW_CCC_COMPILERS) --
-BUILD_CPP= /usr/ccs/lib/cpp
+BUILD_CPP= /usr/lib/cpp
BUILD_LD= $(ONBLD_TOOLS)/bin/$(MACH)/ld
$(MACH)_CC= $(BUILD_CC)
@@ -948,10 +950,10 @@ $(MACH64)_CCC= $(BUILD_CCC)
$(MACH64)_CPP= $(BUILD_CPP)
$(MACH64)_LD= $(BUILD_LD)
-sparc_AS= /usr/ccs/bin/as -xregsym=no
+sparc_AS= /usr/bin/as -xregsym=no
sparcv9_AS= $($(MACH)_AS)
-i386_AS= /usr/ccs/bin/as
+i386_AS= /usr/bin/as
$(__GNUC)i386_AS= $(ONBLD_TOOLS)/bin/$(MACH)/aw
amd64_AS= $(ONBLD_TOOLS)/bin/$(MACH)/aw