From d08ff83bdece645f1aa8aaae0c17ff79f2944f71 Mon Sep 17 00:00:00 2001 From: "jwalden@mit.edu" Date: Tue, 17 Jul 2007 14:23:24 -0700 Subject: [PATCH] Bug 388276 - Build failed on solaris x86 due to checkin for 372428. Patch by Leon Sha , r=cls --- js/src/Makefile.in | 2 +- xpcom/reflect/xptcall/src/md/unix/Makefile.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 0d439332248e..678e10103770 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -166,7 +166,7 @@ EXTRA_DSO_LDOPTS += $(NSPR_LIBS) # When using gcc the assembly is inlined in the C-file (see jslock.c) ifeq ($(OS_ARCH),SunOS) -ifneq ($(OS_TEST),i86pc) +ifneq (86,$(findstring 86,$(OS_TEST))) ifndef GNU_CC ASFILES = lock_$(OS_ARCH).s endif diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in index 9853613e2fec..7904a7d0aa96 100644 --- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -113,7 +113,7 @@ endif # Solaris/Intel # ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_TEST),i86pc) +ifeq (86,$(findstring 86,$(OS_TEST))) CPPSRCS := xptcinvoke_x86_solaris.cpp xptcstubs_x86_solaris.cpp # 28817: if Solaris Intel OS, and native compiler, always build optimised. ifndef GNU_CC @@ -427,7 +427,7 @@ xptcstubs_asm_openvms_alpha.o: $(PUBLIC)/xptcstubsdef.inc $(srcdir)/xptcstubs_as endif ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_TEST),i86pc) +ifeq (86,$(findstring 86,$(OS_TEST))) ifndef GNU_CC xptcstubs_asm_x86_solaris_SUNW.o: $(PUBLIC)/xptcstubsdef.inc $(srcdir)/xptcstubs_asm_x86_solaris_SUNW.s sed \