Mercurial > hg > octave-max
changeset 15124:4e0ab3b28418
Eliminate duplicate PTHREAD_CFLAGS inclusion in build process.
* configure.ac: Add PTHREAD_CFLAGS to CXXFLAGS.
* build-aux/common.mx: Remove PTHREAD_CFLAGS from AM_CPFLAGS and AM_CXXFLAGS.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 07 Aug 2012 09:01:02 -0700 |
| parents | ca222e6932b7 |
| children | 0464e3ceb85b |
| files | build-aux/common.mk configure.ac |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk +++ b/build-aux/common.mk @@ -117,7 +117,7 @@ XTRA_CFLAGS = @XTRA_CFLAGS@ WARN_CFLAGS = @WARN_CFLAGS@ AM_CFLAGS = $(CONFIGURE_CFLAGS) \ - $(INCFLAGS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(PTHREAD_CFLAGS) + $(INCFLAGS) $(XTRA_CFLAGS) $(WARN_CFLAGS) BUG_CFLAGS = $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS) BUILD_CC = @BUILD_CC@ @@ -140,7 +140,7 @@ XTRA_CXXFLAGS = @XTRA_CXXFLAGS@ WARN_CXXFLAGS = @WARN_CXXFLAGS@ AM_CXXFLAGS = $(CONFIGURE_CXXFLAGS) \ - $(INCFLAGS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(PTHREAD_CFLAGS) + $(INCFLAGS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) BUG_CXXFLAGS = $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS) BUILD_CXX = @BUILD_CXX@
--- a/configure.ac +++ b/configure.ac @@ -345,6 +345,7 @@ ## They seem to be required for the OpenGL tests on Debian systems. LIBS="$PTHREAD_LIBS $LIBS" CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" ### When compiling math for x87, problems may arise in some code comparing ### floating-point intermediate results.