Bug 370062 – nss build changes for OpenBSD, r=nelson,wtc

patches contributed by Martynas Venckus <martynas@openbsd.org>


git-svn-id: svn://10.0.0.236/trunk@225986 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nelson%bolyard.com 2007-05-06 08:08:36 +00:00
parent 52a44248d3
commit bc8e3dc393
2 changed files with 9 additions and 6 deletions

View File

@ -37,12 +37,13 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
DEFAULT_COMPILER = gcc
CC = gcc
CCC = g++
CC ?= gcc
CXX ?= g++
DEFAULT_COMPILER = ${CC}
CCC = ${CXX}
RANLIB = ranlib
CPU_ARCH := $(shell uname -p)
CPU_ARCH := $(shell arch -s)
ifeq ($(CPU_ARCH),i386)
OS_REL_CFLAGS = -Di386
CPU_ARCH = x86
@ -64,8 +65,10 @@ OS_LIBS =
ARCH = openbsd
DSO_CFLAGS = -fPIC -DPIC
DSO_LDOPTS = -shared -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
DSO_LDFLAGS =
MKSHLIB = $(CC) $(DSO_LDOPTS)
USE_SYSTEM_ZLIB = 1
ZLIB_LIBS = -lz

View File

@ -192,7 +192,7 @@ endif
# to bind the blapi function references in FREEBLVector vector
# (ldvector.c) to the blapi functions defined in the freebl
# shared libraries.
ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET)))
ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD OpenBSD, $(OS_TARGET)))
MKSHLIB += -Wl,-Bsymbolic
endif