author | Kyle Huey <khuey@kylehuey.com> |
Sat, 04 Dec 2010 23:07:10 -0500 | |
changeset 58619 | ae74a11a7d98f3c82582e2519ac774979127322e |
parent 58617 | 1f2beffd84ff6e63451e0120c5b59bc88e95b9e5 (current diff) |
parent 58618 | 69cbd6df30d089abccea8876f2660e90b42b6061 (diff) |
child 58620 | 48e4a07c0eda7de8b1b260efa8fb27e7845c6d24 |
push id | 17384 |
push user | khuey@kylehuey.com |
push date | Sun, 05 Dec 2010 04:07:42 +0000 |
treeherder | mozilla-central@ae74a11a7d98 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | me, NPOTB |
bugs | 615571 |
milestone | 2.0b8pre |
first release with | nightly linux32
ae74a11a7d98
/
4.0b8pre
/
20101205030316
/
files
nightly linux64
ae74a11a7d98
/
4.0b8pre
/
20101205030316
/
files
nightly mac
ae74a11a7d98
/
4.0b8pre
/
20101205030316
/
files
nightly win32
ae74a11a7d98
/
4.0b8pre
/
20101205030316
/
files
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
releases | nightly linux32
4.0b8pre
/
20101205030316
/
pushlog to previous
nightly linux64
4.0b8pre
/
20101205030316
/
pushlog to previous
nightly mac
4.0b8pre
/
20101205030316
/
pushlog to previous
nightly win32
4.0b8pre
/
20101205030316
/
pushlog to previous
|
config/autoconf.mk.in | file | annotate | diff | comparison | revisions | |
configure.in | file | annotate | diff | comparison | revisions | |
js/src/configure.in | file | annotate | diff | comparison | revisions |
--- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -589,16 +589,18 @@ STATIC_LIBIDL = @STATIC_LIBIDL@ MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ export CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@ MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ COMPILER_DEPEND = @COMPILER_DEPEND@ MDDEPDIR := @MDDEPDIR@ +CC_WRAPPER = @CC_WRAPPER@ +CXX_WRAPPER = @CXX_WRAPPER@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@ # XXX - these need to be cleaned up and have real checks added -cls CM_BLDTYPE=dbg AWT_11=1 OS_TARGET=@OS_TARGET@ OS_ARCH=@OS_ARCH@
--- a/config/config.mk +++ b/config/config.mk @@ -165,29 +165,16 @@ JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(c # If we are linking jemalloc into a program, we want the jemalloc symbols # to be exported ifneq (,$(SIMPLE_PROGRAMS)$(PROGRAM)) JEMALLOC_LIBS += $(MOZ_JEMALLOC_STANDALONE_GLUE_LDOPTS) endif endif endif -ifndef NO_CXX_WRAPPER -ifdef _MSC_VER -ifndef .PYMAKE -CC_WRAPPER = $(PYTHON) -O $(topsrcdir)/build/cl.py -CXX_WRAPPER = $(PYTHON) -O $(topsrcdir)/build/cl.py -else -PYCOMMANDPATH += $(topsrcdir)/build -CC_WRAPPER = %cl InvokeClWithDependencyGeneration -CXX_WRAPPER = %cl InvokeClWithDependencyGeneration -endif # .PYMAKE -endif # _MSC_VER -endif # NO_CXX_WRAPPER - CC := $(CC_WRAPPER) $(CC) CXX := $(CXX_WRAPPER) $(CXX) # determine debug-related options _DEBUG_CFLAGS := _DEBUG_LDFLAGS := ifdef MOZ_DEBUG
--- a/configure.in +++ b/configure.in @@ -8196,25 +8196,31 @@ else changequote(,) CL_INCLUDES_PREFIX=`"${CC}" -showIncludes -c -Fonul dummy-hello.c 2>&1 | sed -ne 's/^\([^:]*:[^:]*:\).*stdio.h$/\1/p'` changequote([,]) if test -z "$CL_INCLUDES_PREFIX"; then AC_MSG_ERROR([Cannot find cl -showIncludes prefix.]) fi AC_SUBST(CL_INCLUDES_PREFIX) rm -f dummy-hello.c + _topsrcdirwin=`cd \`dirname $0\`; pwd -W` dnl cl.py provides dependency generation for MSVC + CC_WRAPPER="$PYTHON -O $_topsrcdirwin/build/cl.py" + CXX_WRAPPER="$PYTHON -O $_topsrcdirwin/build/cl.py" COMPILER_DEPEND=1 fi fi fi # MOZ_AUTO_DEPS MDDEPDIR='.deps' AC_SUBST(MOZ_AUTO_DEPS) AC_SUBST(COMPILER_DEPEND) AC_SUBST(MDDEPDIR) +AC_SUBST(CC_WRAPPER) +AC_SUBST(CXX_WRAPPER) + dnl ======================================================== dnl = dnl = Static Build Options dnl = dnl ======================================================== MOZ_ARG_HEADER(Static build options)
--- a/js/src/config/autoconf.mk.in +++ b/js/src/config/autoconf.mk.in @@ -278,16 +278,18 @@ MOZ_TOOLKIT_REGISTRY_CFLAGS = \ MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ export CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@ MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ COMPILER_DEPEND = @COMPILER_DEPEND@ MDDEPDIR := @MDDEPDIR@ +CC_WRAPPER = @CC_WRAPPER@ +CXX_WRAPPER = @CXX_WRAPPER@ MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@ # XXX - these need to be cleaned up and have real checks added -cls CM_BLDTYPE=dbg AWT_11=1 OS_TARGET=@OS_TARGET@ OS_ARCH=@OS_ARCH@
--- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -165,29 +165,16 @@ JEMALLOC_LIBS = $(MKSHLIB_FORCE_ALL) $(c # If we are linking jemalloc into a program, we want the jemalloc symbols # to be exported ifneq (,$(SIMPLE_PROGRAMS)$(PROGRAM)) JEMALLOC_LIBS += $(MOZ_JEMALLOC_STANDALONE_GLUE_LDOPTS) endif endif endif -ifndef NO_CXX_WRAPPER -ifdef _MSC_VER -ifndef .PYMAKE -CC_WRAPPER = $(PYTHON) -O $(topsrcdir)/build/cl.py -CXX_WRAPPER = $(PYTHON) -O $(topsrcdir)/build/cl.py -else -PYCOMMANDPATH += $(topsrcdir)/build -CC_WRAPPER = %cl InvokeClWithDependencyGeneration -CXX_WRAPPER = %cl InvokeClWithDependencyGeneration -endif # .PYMAKE -endif # _MSC_VER -endif # NO_CXX_WRAPPER - CC := $(CC_WRAPPER) $(CC) CXX := $(CXX_WRAPPER) $(CXX) # determine debug-related options _DEBUG_CFLAGS := _DEBUG_LDFLAGS := ifdef MOZ_DEBUG
--- a/js/src/configure.in +++ b/js/src/configure.in @@ -5497,25 +5497,31 @@ else changequote(,) CL_INCLUDES_PREFIX=`"${CC}" -showIncludes -c -Fonul dummy-hello.c 2>&1 | sed -ne 's/^\([^:]*:[^:]*:\).*stdio.h$/\1/p'` changequote([,]) if test -z "$CL_INCLUDES_PREFIX"; then AC_MSG_ERROR([Cannot find cl -showIncludes prefix.]) fi AC_SUBST(CL_INCLUDES_PREFIX) rm -f dummy-hello.c + _topsrcdirwin=`cd \`dirname $0\`; pwd -W` dnl cl.py provides dependency generation for MSVC + CC_WRAPPER="$PYTHON -O $_topsrcdirwin/build/cl.py" + CXX_WRAPPER="$PYTHON -O $_topsrcdirwin/build/cl.py" COMPILER_DEPEND=1 fi fi fi # MOZ_AUTO_DEPS MDDEPDIR='.deps' AC_SUBST(MOZ_AUTO_DEPS) AC_SUBST(COMPILER_DEPEND) AC_SUBST(MDDEPDIR) +AC_SUBST(CC_WRAPPER) +AC_SUBST(CXX_WRAPPER) + dnl ======================================================== dnl = dnl = Static Build Options dnl = dnl ======================================================== MOZ_ARG_HEADER(Static build options)
--- a/security/manager/Makefile.in +++ b/security/manager/Makefile.in @@ -36,19 +36,19 @@ # # ***** END LICENSE BLOCK ***** DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -NO_CXX_WRAPPER = 1 - include $(DEPTH)/config/autoconf.mk +CC_WRAPPER = +CXX_WRAPPER = include $(topsrcdir)/config/config.mk MODULE = psm ifndef MOZ_NATIVE_NSS LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) endif