зеркало из https://github.com/mozilla/gecko-dev.git
Back out bug 585011 (making cl.py a pymake native command) because of bug 794490.
This commit is contained in:
Родитель
702db3a51e
Коммит
9ba10dd002
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче