5595 libzpool won't build with a studio primary

@@ -899,20 +899,17 @@
 
 #
 # Default label for CTF sections
 #
 CTFCVTFLAGS=            -i -L VERSION
-$(SRCDBGBLD)CTFCVTFLAGS         += -g
 
 #
 # Override to pass module-specific flags to ctfmerge.  Currently used only by
 # krtld to turn on fuzzy matching, and source-level debugging to inhibit
 # stripping.
 #
 CTFMRGFLAGS=
-$(SRCDBGBLD)CTFMRGFLAGS         += -g
-
 
 CTFCONVERT_O            = $(CTFCONVERT) $(CTFCVTFLAGS) $@
 
 ELFSIGN_O=      $(TRUE)
 ELFSIGN_CRYPTO= $(ELFSIGN_O)

@@ -971,12 +968,11 @@
 DEV_CM=         "@($(POUND_SIGN))SunOS Internal Development: non-nightly build"
 
 PROCESS_COMMENT=  @?${MCS} -d -a $(RELEASE_CM) -a $(DEV_CM)
 $(RELEASE_BUILD)PROCESS_COMMENT=   @?${MCS} -d -a $(RELEASE_CM)
 
-STRIP_STABS=                       :
-$(RELEASE_BUILD)STRIP_STABS=       $(STRIP) -x $@
+STRIP_STABS=                       $(STRIP) -x $@
 $(SRCDBGBLD)STRIP_STABS=           :
 
 POST_PROCESS_O= 
 POST_PROCESS_A=
 POST_PROCESS_SO=        $(PROCESS_COMMENT) $@ ; $(STRIP_STABS) ; \