Mercurial > forge

changeset 11647:3fd12a47467e octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not ignore user CXXFLAGS when setting -fno-strict-aliasing.
author i7tiol
date Tue, 23 Apr 2013 04:33:45 +0000
parents b257244ad466
children 567933605445
files main/database/DESCRIPTION main/database/src/Makefile.in
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/database/DESCRIPTION	Mon Apr 22 18:41:18 2013 +0000
+++ b/main/database/DESCRIPTION	Tue Apr 23 04:33:45 2013 +0000
@@ -1,6 +1,6 @@
 Name: database
 Version: 2.1.1
-Date: 2013-04-22
+Date: 2013-04-23
 Author: Olaf Till <i7tiol@t-online.de>
 Maintainer: Olaf Till <i7tiol@t-online.de>
 Title: Database.
--- a/main/database/src/Makefile.in	Mon Apr 22 18:41:18 2013 +0000
+++ b/main/database/src/Makefile.in	Tue Apr 23 04:33:45 2013 +0000
@@ -1,7 +1,11 @@
 # We rely on g++ features, configure assures CXX=g++.
 CXX := @CXX@
 
-CXXFLAGS_NSA := "$(CXXFLAGS) -g -O2 -fno-strict-aliasing"
+ifndef CXXFLAGS
+CXXFLAGS_NSA := "-g -O2 -fno-strict-aliasing"
+else
+CXXFLAGS_NSA := "$(CXXFLAGS) -fno-strict-aliasing"
+endif
 
 OBJECTS := __pq_connect__.o pq_close.o pq_exec.o converters.o \
            converters_arr_comp.o pq_connection.o command.o \