wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 585011 - Invoke cl.py as a pymake native command. r=Callek, a=bsmedberg

Browse Source
This commit is contained in:
Kyle Huey 2010-08-08 23:12:54 -07:00
parent c980e183c4
commit e0760603a1
7 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/autoconf.mk.in
View File

@ -592,8 +592,6 @@ 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@

13
config/config.mk
View File

@ -170,6 +170,19 @@ 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)

6
configure.in
View File

@ -8172,10 +8172,7 @@ else
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
@ -8184,9 +8181,6 @@ MDDEPDIR='.deps'
AC_SUBST(MOZ_AUTO_DEPS)
AC_SUBST(COMPILER_DEPEND)
AC_SUBST(MDDEPDIR)
AC_SUBST(CC_WRAPPER)
AC_SUBST(CXX_WRAPPER)
dnl ========================================================
dnl =

2
js/src/config/autoconf.mk.in
View File

@ -283,8 +283,6 @@ 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@

13
js/src/config/config.mk
View File

@ -170,6 +170,19 @@ 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)

6
js/src/configure.in
View File

@ -5482,10 +5482,7 @@ else
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
@ -5494,9 +5491,6 @@ MDDEPDIR='.deps'
AC_SUBST(MOZ_AUTO_DEPS)
AC_SUBST(COMPILER_DEPEND)
AC_SUBST(MDDEPDIR)
AC_SUBST(CC_WRAPPER)
AC_SUBST(CXX_WRAPPER)
dnl ========================================================
dnl =

4
security/manager/Makefile.in
View File

@ -41,9 +41,9 @@ 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