From 377ab9eb07d3658936b7654ca3bd18fe579b6c01 Mon Sep 17 00:00:00 2001 From: Siddharth Agarwal Date: Sun, 14 Oct 2012 18:54:18 -0700 Subject: [PATCH] Back out bug 585011 (making cl.py a pymake native command) because of bug 794490. --- config/config.mk | 6 ------ js/src/config/config.mk | 6 ------ 2 files changed, 12 deletions(-) diff --git a/config/config.mk b/config/config.mk index b7e479658ae..596e7ebd1d5 100644 --- a/config/config.mk +++ b/config/config.mk @@ -124,14 +124,8 @@ MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFI MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX) ifdef _MSC_VER -ifdef .PYMAKE -PYCOMMANDPATH += $(topsrcdir)/build -CC_WRAPPER ?= %cl InvokeClWithDependencyGeneration -CXX_WRAPPER ?= %cl InvokeClWithDependencyGeneration -else CC_WRAPPER ?= $(PYTHON) -O $(topsrcdir)/build/cl.py CXX_WRAPPER ?= $(PYTHON) -O $(topsrcdir)/build/cl.py -endif # .PYMAKE endif # _MSC_VER CC := $(CC_WRAPPER) $(CC) diff --git a/js/src/config/config.mk b/js/src/config/config.mk index b7e479658ae..596e7ebd1d5 100644 --- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -124,14 +124,8 @@ MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFI MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX) ifdef _MSC_VER -ifdef .PYMAKE -PYCOMMANDPATH += $(topsrcdir)/build -CC_WRAPPER ?= %cl InvokeClWithDependencyGeneration -CXX_WRAPPER ?= %cl InvokeClWithDependencyGeneration -else CC_WRAPPER ?= $(PYTHON) -O $(topsrcdir)/build/cl.py CXX_WRAPPER ?= $(PYTHON) -O $(topsrcdir)/build/cl.py -endif # .PYMAKE endif # _MSC_VER CC := $(CC_WRAPPER) $(CC)