diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-06-07 01:11:59 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-06-07 01:11:59 +0000 |
| commit | 7c3bccee13a08104eaea20ba2fec7fbfee2e59ee (patch) | |
| tree | d1f640b571a891fcfe4677dc77ee92e234913978 | |
| parent | 707ab9864fd9dbfb2c1fbdb45308f96983f07c51 (diff) | |
| download | nspr-hg-7c3bccee13a08104eaea20ba2fec7fbfee2e59ee.tar.gz | |
Do not use IRIX native compiler options such as -n32 when NS_USE_GCC is
defined.
Modified files: config/Makefile.in, pr/tests/Makefile.in
| -rw-r--r-- | config/Makefile.in | 3 | ||||
| -rw-r--r-- | pr/tests/Makefile.in | 15 |
2 files changed, 11 insertions, 7 deletions
diff --git a/config/Makefile.in b/config/Makefile.in index dca9fe4f..7d2e5f76 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -75,9 +75,8 @@ endif ifeq ($(OS_ARCH), IRIX) ifeq ($(basename $(OS_RELEASE)),6) ifeq ($(USE_N32),1) + ifndef NS_USE_GCC XLDOPTS += -n32 -Wl,-woff,85 - ifeq ($(OS_RELEASE), 6_2) - XLDOPTS += -Wl,-woff,85 endif else ifeq ($(USE_64),1) diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in index ecead6d8..99dcd64a 100644 --- a/pr/tests/Makefile.in +++ b/pr/tests/Makefile.in @@ -254,13 +254,18 @@ ifeq ($(OS_ARCH), IRIX) ifeq ($(USE_CPLUS), 1) CC = CC endif - LDOPTS += -rpath $(ABSOLUTE_LIB_DIR) -rdata_shared + LDOPTS += -rpath $(ABSOLUTE_LIB_DIR) + ifndef NS_USE_GCC + LDOPTS += -rdata_shared + endif # For 6.x machines, include this flag ifeq ($(basename $(OS_RELEASE)),6) - ifeq ($(USE_N32),1) - LDOPTS += -n32 - else - LDOPTS += -32 + ifndef NS_USE_GCC + ifeq ($(USE_N32),1) + LDOPTS += -n32 + else + LDOPTS += -32 + endif endif ifeq ($(USE_PTHREADS), 1) |