Bug 719718 - hostxpt is unnecessary even if cross. r=khuey
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 31 Jan 2012 10:24:08 +0900
changeset 87012 cfefd7606d75f68a4baf355e93a81f876f2eaa16
parent 87011 ef4badb703b714404f2216de6641cb33fcfa0284
child 87013 9eafdaeae37878ebd13de2da3b36752f3c164494
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs719718
milestone12.0a1
Bug 719718 - hostxpt is unnecessary even if cross. r=khuey
xpcom/typelib/xpt/src/Makefile.in
--- a/xpcom/typelib/xpt/src/Makefile.in
+++ b/xpcom/typelib/xpt/src/Makefile.in
@@ -42,47 +42,35 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpcom
 LIBRARY_NAME	= xpt
 LIB_IS_C_ONLY	= 1
 DIST_INSTALL	= 1
 
-ifdef CROSS_COMPILE
-HOST_LIBRARY_NAME	= hostxpt
-endif
-
 CSRCS		= xpt_arena.c xpt_struct.c xpt_xdr.c
-HOST_CSRCS	= $(CSRCS)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 
 # Don't use profile-guided optimization
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DEXPORT_XPT_API
-HOST_CFLAGS	+= -DEXPORT_XPT_API
 
 # Build libxpt early so that it'll be available to xpidl, which also
 # must be built early.
 export::
 	@$(MAKE) libs
 
-ifdef CROSS_COMPILE
-ifdef HOST_NSPR_MDCPUCFG
-HOST_CFLAGS     += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
-endif
-endif
-
 # XXX, bug 417045, make -jN combines badly with -save-temps in   
 # CFLAGS/CXXFLAGS (for stabs symbols with XCode3)
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 .NOTPARALLEL:
 endif
 
 ifdef _MSC_VER
 OS_COMPILE_CFLAGS += -Zl