2011/6/28 Ned Deily <nad at acm.org>: > In article <E1QYQFe-0006Ir-1o at dinsdale.python.org>, > benjamin.peterson <python-checkins at python.org> wrote: > >> http://hg.python.org/cpython/rev/0d0ca6f95d9d >> changeset: 70879:0d0ca6f95d9d >> user: Benjamin Peterson <benjamin at python.org> >> date: Sun Jun 19 17:17:30 2011 -0500 >> summary: >> remove duplicate -I >> >> files: >> Makefile.pre.in | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> >> diff --git a/Makefile.pre.in b/Makefile.pre.in >> --- a/Makefile.pre.in >> +++ b/Makefile.pre.in >> @@ -73,7 +73,7 @@ >> # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py >> to >> # be able to build extension modules using the directories specified in the >> # environment variables >> -PY_CPPFLAGS= -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) >> $(CPPFLAGS) >> +PY_CPPFLAGS= -I. -IInclude $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) >> PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) >> NO_AS_NEEDED= @NO_AS_NEEDED@ >> LDLAST= @LDLAST@ > > I think someone has already mentioned that this change breaks builds > with a source directory outside the build directory and that breaks my > OS X installer builds. Please revert or make the following change > which works for me (but not tested elsewhere): > > -PY_CPPFLAGS= -I. -IInclude $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) > +PY_CPPFLAGS= -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) Committed. Thanks for the review. -- Regards, Benjamin
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4