diff options
| author | Ludovic Hirlimann <ludovic@mozilla.com> | 2022-09-07 21:14:24 +0000 |
|---|---|---|
| committer | Ludovic Hirlimann <ludovic@mozilla.com> | 2022-09-07 21:14:24 +0000 |
| commit | 775b3508090719d554640958ba5bce3baf74c654 (patch) | |
| tree | 43c790ac7f3cb2aee60e9d8fd0c61af2f6ce83ae /coreconf | |
| parent | 0e775c98fd0fbfa50012c4a6254351a8e12f4811 (diff) | |
| download | nss-hg-775b3508090719d554640958ba5bce3baf74c654.tar.gz | |
Bug 1563221 remove older oses that are unused part3/ BeOS r=nss-reviewers,djackson
Depends on D36757
Differential Revision: https://phabricator.services.mozilla.com/D37215
Diffstat (limited to 'coreconf')
| -rw-r--r-- | coreconf/BeOS.mk | 47 | ||||
| -rw-r--r-- | coreconf/config.mk | 2 | ||||
| -rw-r--r-- | coreconf/nsinstall/nsinstall.c | 6 |
3 files changed, 2 insertions, 53 deletions
diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk deleted file mode 100644 index 750696da5..000000000 --- a/coreconf/BeOS.mk +++ /dev/null @@ -1,47 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include $(CORE_DEPTH)/coreconf/UNIX.mk - -XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS) - -USE_PTHREADS = - -ifeq ($(USE_PTHREADS),1) - IMPL_STRATEGY = _PTH -endif - -CC = gcc -CCC = g++ -RANLIB = ranlib - -DEFAULT_COMPILER = gcc - -ifeq ($(OS_TEST),ppc) - OS_REL_CFLAGS = -Dppc - CPU_ARCH = ppc -else - OS_REL_CFLAGS = -Di386 - CPU_ARCH = x86 -endif - -MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -ifdef BUILD_OPT - OPTIMIZER = -O2 -endif - -OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -OS_LIBS = -lbe - -DEFINES += -DBEOS - -ifdef USE_PTHREADS - DEFINES += -D_REENTRANT -endif - -ARCH = beos - -DSO_CFLAGS = -fPIC -DSO_LDOPTS = diff --git a/coreconf/config.mk b/coreconf/config.mk index d4c9ccaa1..2ee4797bb 100644 --- a/coreconf/config.mk +++ b/coreconf/config.mk @@ -30,7 +30,7 @@ endif # one for each OS release. # ####################################################################### -TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ +TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin OpenBSD \ AIX RISCOS WINNT WIN95 Linux Android ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) diff --git a/coreconf/nsinstall/nsinstall.c b/coreconf/nsinstall/nsinstall.c index 3df0ae6b0..952c4e418 100644 --- a/coreconf/nsinstall/nsinstall.c +++ b/coreconf/nsinstall/nsinstall.c @@ -26,16 +26,12 @@ typedef unsigned int mode_t; #define HAVE_LCHOWN -#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(LINUX) || defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(NTO) || defined(DARWIN) || defined(BEOS) || defined(__riscos__) +#if defined(AIX) || defined(BSDI) || defined(HPUX) || defined(LINUX) || defined(SUNOS4) || defined(SCO) || defined(UNIXWARE) || defined(NTO) || defined(DARWIN) || defined(__riscos__) #undef HAVE_LCHOWN #endif #define HAVE_FCHMOD -#if defined(BEOS) -#undef HAVE_FCHMOD -#endif - #ifdef LINUX #include <getopt.h> #endif |