--- a/make-rules/shared-macros.mk	Mon Apr 04 19:54:26 2011 -0700
+++ b/make-rules/shared-macros.mk	Mon Apr 04 23:24:05 2011 -0700
@@ -216,6 +216,7 @@
 AUTOMAKE =	/usr/bin/automake-1.10
 AUTORECONF = 	/usr/bin/autoreconf
 
+KSH93 =         /usr/bin/ksh93
 TOUCH =		/usr/bin/touch
 MKDIR =		/bin/mkdir -p
 RM =		/bin/rm -f
@@ -296,6 +297,13 @@
 # statements.
 studio_FEATURES_EXTENSIONS =	-features=extensions
 
+# CC requires -norunpath to avoid linking in its RUNPATH to C++ applications.
+studio_NORUNPATH =	 -norunpath
+
+# To link in standard mode (the default mode) without any C++ libraries
+# (except libCrun), use studio_LIBRARY_NONE in your compnent Makefile.
+studio_LIBRARY_NONE =	 -library=%none
+
 # Control the Studio optimization level.
 studio_OPT.sparc.32 =	-xO4
 studio_OPT.sparc.64 =	-xO4