Bugzilla bug #265: Use full pathname /usr/ccs/bin/as (as opposed to just
authorwtc
Thu, 07 May 1998 06:29:44 +0000
changeset 98 a40f22988c9894de4a309c6c8ad41c0108beffd2
parent 97 5be9ccabb37eed7f2a6ff59407a25e088363ff04
child 99 02b57ea376944292711635f27954ac879a99f5c0
push idunknown
push userunknown
push dateunknown
bugs265
Bugzilla bug #265: Use full pathname /usr/ccs/bin/as (as opposed to just 'as') to assemble os_SunOS_ultrasparc.s because we need the -P option of Solaris 'as' to run cpp and process header file inclusion. This way we won't accidentally get GNU 'as', which doesn't understand -P. We acknowledge Paul Kanz (pkanz@conix.com) for suggesting the fix.
pr/src/md/unix/Makefile
--- a/pr/src/md/unix/Makefile
+++ b/pr/src/md/unix/Makefile
@@ -192,24 +192,22 @@ ifneq ($(OS_RELEASE),4.2)
 ifneq ($(USE_PTHREADS), 1)
 #TARGETS		+= $(OBJDIR)/aixwrap.$(OBJ_SUFFIX)
 endif
 endif
 endif
 
 ifeq ($(OS_ARCH),SunOS)
 	ifneq ($(OS_RELEASE),4.1.3_U1)
-    	ifeq ($(OS_TEST),sun4u)
-			ifneq ($(NS_USE_GCC),1)
-				LIBRARY_NAME = $(ULTRASPARC_LIBRARY)
-				LIBRARY_VERSION = $(MOD_VERSION)
-				ULTRASPARC_ASFILES = os_$(OS_ARCH)_ultrasparc.s
-				ULTRASPARC_ASOBJS = $(addprefix $(OBJDIR)/,$(ULTRASPARC_ASFILES:.s=.$(OBJ_SUFFIX)))
-				TARGETS		+= $(ULTRASPARC_ASOBJS) $(SHARED_LIBRARY)
-			endif
+		ifeq ($(OS_TEST),sun4u)
+			LIBRARY_NAME = $(ULTRASPARC_LIBRARY)
+			LIBRARY_VERSION = $(MOD_VERSION)
+			ULTRASPARC_ASFILES = os_$(OS_ARCH)_ultrasparc.s
+			ULTRASPARC_ASOBJS = $(addprefix $(OBJDIR)/,$(ULTRASPARC_ASFILES:.s=.$(OBJ_SUFFIX)))
+			TARGETS		+= $(ULTRASPARC_ASOBJS) $(SHARED_LIBRARY)
 		endif
 	endif
 endif
 
 INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
 
 include $(MOD_DEPTH)/config/rules.mk
 
@@ -220,21 +218,19 @@ export:: $(TARGETS)
 #	$(INSTALL) -m 444 $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) $(DIST)/lib
 #endif
 #endif
 #endif
 
 ifeq ($(OS_ARCH),SunOS)
 ifneq ($(OS_RELEASE),4.1.3_U1)
 ifeq ($(OS_TEST),sun4u)
-ifneq ($(NS_USE_GCC),1)
 $(SHARED_LIBRARY): $(ULTRASPARC_ASOBJS)
 	$(LD) -G -z text -o $@ $(ULTRASPARC_ASOBJS)
 	$(INSTALL) -m 444 $(SHARED_LIBRARY) $(DIST)/lib
 
 $(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES)
-	as -o $@ -K PIC -P -D_ASM -D__STDC__=0 -xarch=v8plus $(ULTRASPARC_ASFILES)
-endif
+	/usr/ccs/bin/as -o $@ -K PIC -P -D_ASM -D__STDC__=0 -xarch=v8plus $(ULTRASPARC_ASFILES)
 endif
 endif
 endif
 
 install:: export