diff options
| author | wtc%netscape.com <devnull@localhost> | 2000-06-29 00:24:19 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2000-06-29 00:24:19 +0000 |
| commit | 62ff898feb268ab80ebdde730030dafb28e7d67e (patch) | |
| tree | 120534c9ae0b63ea2bbd6d0ecf1350ca4c461aae | |
| parent | 2a9425bf3dd2026541d7e459a3930d8c534bc9f7 (diff) | |
| download | nspr-hg-62ff898feb268ab80ebdde730030dafb28e7d67e.tar.gz | |
Bugzilla bug #44133: checked in NTO patches contributed by
Jerry Kirk <Jerry.Kirk@nexwarecorp.com>.
Modified files: NTO.mk, arch.mk
(NSPRPUB_CLIENT_BRANCH. a=brendan@mozilla.org.)
| -rw-r--r-- | config/NTO.mk | 6 | ||||
| -rw-r--r-- | config/arch.mk | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/config/NTO.mk b/config/NTO.mk index a0b53ecd..49eee1fe 100644 --- a/config/NTO.mk +++ b/config/NTO.mk @@ -55,7 +55,7 @@ OS_CFLAGS = -Wc,-Wall -Wc,-Wno-parentheses -DNTO \ -D_QNX_SOURCE -DHAVE_POINTER_LOCALTIME_R -shared COMPILER_TAG = _qcc -MKSHLIB = qcc -Vgcc_ntox86 -shared -Wl,-h$(@:$(OBJDIR)/%.so=%.so) -g2 -M +MKSHLIB = qcc -Vgcc_ntox86 -shared -Wl,-h$(@:$(OBJDIR)/%.so=%.so) -M RANLIB = ranlib G++INCLUDES = @@ -63,9 +63,9 @@ OS_LIBS = EXTRA_LIBS = -lsocket ifdef BUILD_OPT -OPTIMIZER = -O2 +OPTIMIZER = -O1 else -OPTIMIZER = -O2 -gdwarf-2 +OPTIMIZER = -O1 -gstabs endif NOSUCHFILE = /no-such-file diff --git a/config/arch.mk b/config/arch.mk index 9f4be290..35a448aa 100644 --- a/config/arch.mk +++ b/config/arch.mk @@ -60,10 +60,6 @@ endif ifeq ($(OS_ARCH),NCR) OS_RELEASE := $(shell awk '{print $$3}' /etc/.relid | sed 's/^\([0-9]\)\(.\)\(..\)\(.*\)$$/\2.\3/') endif -ifeq ($(OS_ARCH),procnto) -OS_ARCH := NTO -OS_RELEASE := _$(OS_TEST)$(OS_RELEASE) -endif ifeq ($(OS_ARCH),UNIX_System_V) OS_ARCH := NEC endif @@ -73,7 +69,12 @@ CPU_ARCH := $(shell uname -Wh) OS_RELEASE := $(shell uname -v) endif ifeq ($(OS_ARCH),QNX) -OS_RELEASE := $(shell uname -v | sed 's/^\([0-9]\)\([0-9]*\)$$/\1.\2/') + ifeq ($(OS_RELEASE),6.00) + OS_ARCH := NTO + OS_RELEASE := _$(OS_TEST)$(OS_RELEASE) + else + OS_RELEASE := $(shell uname -v | sed 's/^\([0-9]\)\([0-9]*\)$$/\1.\2/') + endif endif ifeq ($(OS_ARCH),SCO_SV) OS_ARCH := SCOOS |