Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 841992: Use coreconf/SunOS5.mk for all Solaris versions. r=kaie.

Browse Source 
Modified Files:
	SunOS5.mk config.mk


git-svn-id: svn://10.0.0.236/trunk@264760 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%google.com 2013-02-18 23:39:06 +00:00
parent 4cf83d6235
commit 8a71a49a4c
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/security/coreconf/SunOS5.mk
View File

@ -67,6 +67,15 @@ RANLIB = echo
CPU_ARCH = sparc CPU_ARCH = sparc
OS_DEFINES += -DSVR4 -DSYSV -D__svr4 -D__svr4__ -DSOLARIS -D_REENTRANT OS_DEFINES += -DSVR4 -DSYSV -D__svr4 -D__svr4__ -DSOLARIS -D_REENTRANT
ifeq ($(OS_TEST),i86pc)
ifeq ($(USE_64),1)
CPU_ARCH = x86_64
else
CPU_ARCH = x86
OS_DEFINES += -Di386
endif
endif
# Purify doesn't like -MDupdate # Purify doesn't like -MDupdate
NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS) NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS)
@ -90,9 +99,6 @@ endif
PROCESS_MAP_FILE = grep -v ';-' $< | \ PROCESS_MAP_FILE = grep -v ';-' $< | \
sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
# ld options: # ld options:
# -G: produce a shared object # -G: produce a shared object
# -z defs: no unresolved symbols allowed # -z defs: no unresolved symbols allowed
@ -135,3 +141,4 @@ else
RPATH = -R '$$ORIGIN' RPATH = -R '$$ORIGIN'
endif endif
OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc

4
mozilla/security/coreconf/config.mk
View File

@ -36,8 +36,12 @@ TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
else else
ifeq ($(OS_TARGET),SunOS)
include $(CORE_DEPTH)/coreconf/SunOS5.mk
else
include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk include $(CORE_DEPTH)/coreconf/$(OS_TARGET)$(OS_RELEASE).mk
endif endif
endif
####################################################################### #######################################################################
# [4.0] Master "Core Components" source and release <platform> tags # # [4.0] Master "Core Components" source and release <platform> tags #