diff options
| author | fergus.henderson <fergushenderson@users.noreply.github.com> | 2008-12-02 21:44:21 +0000 |
|---|---|---|
| committer | fergus.henderson <fergushenderson@users.noreply.github.com> | 2008-12-02 21:44:21 +0000 |
| commit | e690460d7abf332aa62c472604e64296941e06f7 (patch) | |
| tree | 70bf47df1d7bacf3e900f4e67e70e815999e1032 /Makefile.in | |
| parent | 2683e9432597fd255a4cb3addc5016a66fb99db1 (diff) | |
| download | distcc-git-e690460d7abf332aa62c472604e64296941e06f7.tar.gz | |
1. Fix some compilation errors arising from the use of
-Wwrite-strings when compiling the python extension module,
due to lack of const correctness in the Python 2.2
"Python.h" header file.
This problem was introduced by the fix for distcc issue 26
<http://code.google.com/p/distcc/issues/detail?id=26>.
The solution was to explicitly disable these warnings
with -Wno-write-strings.
2. Centralize the use of gcc-specific compilation options
in conditional code in configure.ac that is only executed
if we're using gcc. Previously include_server/setup.py
was hard-coding gcc-specific options, regardless of
whether we're using gcc.
3. Don't use -Wuninitialized if CFLAGS doesn't contain "-O*",
because -Wuninitialized only works if optimization is enabled.
This avoids a gcc warning (and hence an error with -Werror)
about -Wuninitialized not having any effect
when distcc is configured with "CFLAGS=-g ./configure".
4. Add a new configure option "--disable-Werror".
For the 3.0 release of distcc, some people porting distcc
resorted to patching distcc to remove the -Werror option.
-Werror is useful, so I want to keep it enabled by default,
but I'd prefer that people are able to port distcc easily,
hence the configure option.
This addresses distcc issue 20
<http://code.google.com/p/distcc/issues/detail?id=20>.
Reviewers: Craig Silverstein
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 2813ec6..073482e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,6 +17,7 @@ SHELL = @SHELL@ CFLAGS = @CFLAGS@ WERROR_CFLAGS = @WERROR_CFLAGS@ +PYTHON_CFLAGS = @PYTHON_CFLAGS@ POPT_CFLAGS = @POPT_CFLAGS@ POPT_INCLUDES = @POPT_INCLUDES@ @@ -561,7 +562,7 @@ include-server: mkdir -p "$(include_server_builddir)" && \ DISTCC_VERSION="$(VERSION)" \ SRCDIR="$(srcdir)" \ - CFLAGS="$(CFLAGS)" \ + CFLAGS="$(CFLAGS) $(PYTHON_CFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" \ $(INCLUDESERVER_PYTHON) "$(srcdir)/include_server/setup.py" \ build \ @@ -920,7 +921,7 @@ clean-include-server: if test -n "$(INCLUDESERVER_PYTHON)"; then \ DISTCC_VERSION="$(VERSION)" \ SRCDIR="$(srcdir)" \ - CFLAGS="$(CFLAGS)" \ + CFLAGS="$(CFLAGS) $(PYTHON_CFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" \ $(INCLUDESERVER_PYTHON) "$(srcdir)/include_server/setup.py" \ clean \ @@ -1041,6 +1042,7 @@ install-include-server: include-server pump DESTDIR=`cd "$(DESTDIR)/" && pwd` && \ DISTCC_VERSION="$(VERSION)" \ SRCDIR="$(srcdir)" \ + CFLAGS="$(CFLAGS) $(PYTHON_CFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" \ $(INCLUDESERVER_PYTHON) "$(srcdir)/include_server/setup.py" \ build \ |