Bug 942645 - Remove old OS_RELEAE reference. r=glandium
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Fri, 29 Nov 2013 13:52:22 +0900
changeset 158007 c84597fb24e0c690da82e303444da6b5ae1ec6bc
parent 158006 41c241079f2515c0ac764516c38564617e02bfc3
child 158008 040f7055cab9725de80ce19de6fd9edee0e14a9f
child 158050 648926a246c0cdfb3385553913c98816e7741219
push id36907
push userm_kato@ga2.so-net.ne.jp
push dateFri, 29 Nov 2013 04:53:21 +0000
treeherdermozilla-inbound@c84597fb24e0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs942645
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 942645 - Remove old OS_RELEAE reference. r=glandium
config/Makefile.in
intl/uconv/tools/Makefile.in
js/src/Makefile.in
xpcom/tests/Makefile.in
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -50,20 +50,16 @@ HEADERS_TARGET := export
 INSTALL_TARGETS += HEADERS
 
 PYTHON_UNIT_TESTS := $(wildcard $(srcdir)/tests/unit-*.py)
 
 include $(topsrcdir)/config/rules.mk
 
 HOST_CFLAGS += -DUNICODE -D_UNICODE
 
-ifeq ($(OS_CONFIG),SunOS4.1)
-NSPR_CFLAGS	+= -I$(srcdir)/../nsprpub/pr/include/md
-endif
-
 # Generate a new buildid every time we "export" in config... that's only
 # supposed to be once per-build!
 export::
 ifdef MOZ_BUILD_DATE
 	printf "%s" $(MOZ_BUILD_DATE) > buildid
 else
 	$(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid > buildid
 endif
deleted file mode 100644
--- a/intl/uconv/tools/Makefile.in
+++ /dev/null
@@ -1,13 +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 $(topsrcdir)/config/rules.mk
-
-# needed for mac linux
-ifeq ($(OS_ARCH),Linux)
-ifneq ($(OS_RELEASE),1.2)
-OS_LIBS		+= /usr/lib/libdl.so
-endif
-endif
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -441,35 +441,18 @@ ifeq ($(OS_ARCH),SunOS)
 ifeq ($(TARGET_CPU),sparc)
 
 ifdef GNU_CC
 CFLAGS   += -mcpu=v9
 CXXFLAGS += -mcpu=v9
 endif # GNU_CC
 
 endif
-ifeq ($(OS_RELEASE),4.1)
-EXTRA_LIBS	+= -ldl -lnsl
-else
 EXTRA_LIBS	+= -lposix4 -ldl -lnsl -lsocket
 endif
-endif
-
-# An AIX Optimization bug causes PR_dtoa() & JS_dtoa to produce wrong result.
-# This suppresses optimization for this single compilation unit.
-ifeq ($(OS_ARCH),AIX)
-jsatom.o: jsatom.cpp Makefile.in
-	$(REPORT_BUILD)
-	@$(MAKE_DEPS_AUTO_CXX)
-	$(CXX) -o $@ -c $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(COMPILE_CFLAGS)) $<
-jsdtoa.o: jsdtoa.cpp Makefile.in
-	$(REPORT_BUILD)
-	@$(MAKE_DEPS_AUTO_CXX)
-	$(CXX) -o $@ -c $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(COMPILE_CFLAGS)) $<
-endif
 
 # Compute the linker flags that programs linking against SpiderMonkey should
 # pass to get SpiderMonkey and its dependencies, beyond just the -L and -l
 # for the SpiderMonkey library itself.
 # - EXTRA_DSO_LDOPTS includes the NSPR -L and -l flags.
 # - OS_LIBS includes libraries selected by the configure script.
 # - EXTRA_LIBS includes libraries selected by this Makefile.
 JS_CONFIG_LIBS=$(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS)
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -1,21 +1,16 @@
 # 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/.
 
 VPATH += $(topsrcdir)/build
 
 LIBS += $(XPCOM_LIBS)
 
-# Needed to resolve __yylex (?)
-ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
-LIBS		+= -lpcap
-endif
-
 # Make sure we have symbols in case we need to debug these.
 MOZ_DEBUG_SYMBOLS = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
                 -I$(srcdir)/../ds \
 		$(NULL)