diff options
| author | wtc <devnull@localhost> | 1998-05-07 06:29:44 +0000 |
|---|---|---|
| committer | wtc <devnull@localhost> | 1998-05-07 06:29:44 +0000 |
| commit | 9e66b373629c87cbecbeb6578db7c53fc3a6dbde (patch) | |
| tree | 3cd1308296709d7679a3d9023ae3c1f4d2c19161 | |
| parent | d5ecb05e6d8df55f7ea9d43b9f82abccc368bc56 (diff) | |
| download | nspr-hg-9e66b373629c87cbecbeb6578db7c53fc3a6dbde.tar.gz | |
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.
| -rw-r--r-- | pr/src/md/unix/Makefile | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pr/src/md/unix/Makefile b/pr/src/md/unix/Makefile index 6219058c..e0c44697 100644 --- a/pr/src/md/unix/Makefile +++ b/pr/src/md/unix/Makefile @@ -197,14 +197,12 @@ 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 @@ -225,14 +223,12 @@ export:: $(TARGETS) 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 |