diff options
| author | wtc <devnull@localhost> | 1998-06-08 23:43:33 +0000 |
|---|---|---|
| committer | wtc <devnull@localhost> | 1998-06-08 23:43:33 +0000 |
| commit | daab877e82ea174807539c315562883860d98010 (patch) | |
| tree | a431dbe4414ca8d62be3dd4d81d892503bf86b79 | |
| parent | 1a63b1c00cd0e6f843bc570b3a9bca266ad0a657 (diff) | |
| download | nspr-hg-daab877e82ea174807539c315562883860d98010.tar.gz | |
Use -32 flag for compiler and linker explicitly on IRIX 6.x. This is
necessary on IRIX 6.4 where -n32 is the default. Thanks to Tomi (a
CS student in Finland whose last name I forget) for the patch.
| -rw-r--r-- | config/IRIX.mk | 9 | ||||
| -rw-r--r-- | lib/msgc/tests/Makefile | 5 | ||||
| -rw-r--r-- | pr/tests/Makefile | 5 |
3 files changed, 14 insertions, 5 deletions
diff --git a/config/IRIX.mk b/config/IRIX.mk index 851abdd9..8487cbad 100644 --- a/config/IRIX.mk +++ b/config/IRIX.mk @@ -51,7 +51,7 @@ endif endif # For 6.x machines, include this flag -ifeq (6.,$(findstring 6.,$(OS_RELEASE))) +ifeq ($(basename $(OS_RELEASE)),6) ifeq ($(USE_N32),1) ODD_CFLAGS += -n32 -exceptions -woff 1209,1642,3201 COMPILER_TAG = _n32 @@ -95,10 +95,11 @@ endif # catch unresolved symbols ifeq ($(basename $(OS_RELEASE)),6) SHLIB_LD_OPTS = -no_unresolved -endif - ifeq ($(USE_N32),1) SHLIB_LD_OPTS += -n32 +else +SHLIB_LD_OPTS += -32 +endif endif MKSHLIB = $(LD) $(SHLIB_LD_OPTS) -rdata_shared -shared -soname $(@:$(OBJDIR)/%.so=%.so) @@ -109,6 +110,4 @@ DSO_LDOPTS = -elf -shared -all ifdef DSO_BACKEND DSO_LDOPTS += -soname $(DSO_NAME) - - endif diff --git a/lib/msgc/tests/Makefile b/lib/msgc/tests/Makefile index 12d751e4..abe5cdb7 100644 --- a/lib/msgc/tests/Makefile +++ b/lib/msgc/tests/Makefile @@ -80,8 +80,13 @@ endif ifeq ($(OS_ARCH), IRIX) LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared +# For 6.x machines, include this flag +ifeq ($(basename $(OS_RELEASE)),6) ifeq ($(USE_N32),1) LDOPTS += -n32 +else +LDOPTS += -32 +endif endif endif diff --git a/pr/tests/Makefile b/pr/tests/Makefile index 9c96e3d3..9db675f9 100644 --- a/pr/tests/Makefile +++ b/pr/tests/Makefile @@ -167,8 +167,13 @@ endif ifeq ($(OS_ARCH), IRIX) LDOPTS += -rpath $(PWD)/$(DIST)/lib -rdata_shared +# For 6.x machines, include this flag +ifeq ($(basename $(OS_RELEASE)),6) ifeq ($(USE_N32),1) LDOPTS += -n32 +else +LDOPTS += -32 +endif endif endif |