2 files changed, 5 insertions, 6 deletions
diff --git a/bin/9c b/bin/9c
index 871e6f66..beba6064 100755
--- a/bin/9c
+++ b/bin/9c
@@ -3,10 +3,9 @@
 usegcc()
 {
 	cc=gcc
-	cflags=" \
+	ngflags=" \
 		-O2 \
 		-c \
-		-ggdb \
 		-Wall \
 		-Wno-parentheses \
 		-Wno-missing-braces \
@@ -14,14 +13,14 @@ usegcc()
 		-Wno-comment \
 		-Wno-sign-compare \
 	"
+	cflags="$cflags -ggdb"
 }
 
-tag="`uname`-`uname -m`-${CC9:-cc}"
+tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}-${CC9:-cc}"
 case "$tag" in
 *BSD*)		usegcc ;;
 *Darwin*)	usegcc 
-	cflags=`echo $cflags|sed 's/-ggdb/-g3 -no-cpp-precomp/'`
-	;;
+		cflags="$ngflags -g3 -no-cpp-precomp" ;;
 *HP-UX*)	cc=cc; cflags="-g -O -c -Ae" ;;
 *Linux*)	usegcc ;;
 *OSF1*)		cc=cc; cflags="-g -O -c" ;;
diff --git a/bin/9l b/bin/9l
index 19be47ed..e510e4d6 100755
--- a/bin/9l
+++ b/bin/9l
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 extralibs=-lm
-tag="`uname`-`uname -m`"
+tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
 case "$tag" in
 *FreeBSD*)	ld=gcc ;;
 *BSD*)		ld=gcc ;;