From 0658db42438e2c5dccc511dcee4ec1d2f408ae41 Mon Sep 17 00:00:00 2001 From: "wtc%netscape.com" Date: Thu, 14 Jun 2001 02:23:42 +0000 Subject: [PATCH] Put all IRIX cc compiler options inside the ifndef NS_USE_GCC block. Modified files: config/Makefile.in pr/tests/Makefile.in --- nsprpub/config/Makefile.in | 22 +++++++++++----------- nsprpub/pr/tests/Makefile.in | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nsprpub/config/Makefile.in b/nsprpub/config/Makefile.in index 7d2e5f76d66..0360255b6e7 100644 --- a/nsprpub/config/Makefile.in +++ b/nsprpub/config/Makefile.in @@ -74,17 +74,17 @@ endif ifeq ($(OS_ARCH), IRIX) ifeq ($(basename $(OS_RELEASE)),6) - ifeq ($(USE_N32),1) - ifndef NS_USE_GCC - XLDOPTS += -n32 -Wl,-woff,85 - endif - else - ifeq ($(USE_64),1) - XLDOPTS += -64 - else - XLDOPTS += -32 - endif - endif + ifndef NS_USE_GCC + ifeq ($(USE_N32),1) + XLDOPTS += -n32 -Wl,-woff,85 + else + ifeq ($(USE_64),1) + XLDOPTS += -64 + else + XLDOPTS += -32 + endif + endif + endif endif endif diff --git a/nsprpub/pr/tests/Makefile.in b/nsprpub/pr/tests/Makefile.in index 99dcd64affe..8a190b9a6f7 100644 --- a/nsprpub/pr/tests/Makefile.in +++ b/nsprpub/pr/tests/Makefile.in @@ -266,11 +266,11 @@ ifeq ($(OS_ARCH), IRIX) else LDOPTS += -32 endif - endif - ifeq ($(USE_PTHREADS), 1) - ifeq ($(OS_RELEASE), 6.2) - LDOPTS += -Wl,-woff,85 + ifeq ($(USE_PTHREADS), 1) + ifeq ($(OS_RELEASE), 6.2) + LDOPTS += -Wl,-woff,85 + endif endif endif endif