Skip to content

Commit 5c9e546

Browse files
author
Herbert Koelman
committed
refs #41
* in configure, explicitly state the used specific compiler/linker options.
1 parent 639427c commit 5c9e546

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

src/configure

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3894,10 +3894,11 @@ OBJECTS=$OBJECTS
38943894
$as_echo_n "checking for specific $CXX compiler options... " >&6; }
38953895
case "$CXX" in
38963896
xlC_r | xlC)
3897-
CFLAGS="-bh:5 -q$bits -O $CFLAGS"
3898-
CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert::rvaluereferences:rvaluereferences -qwarn0x -qsourcetype=c++ $CPPFLAGS"
3899-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3900-
$as_echo "yes" >&6; }
3897+
CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
3898+
CFLAGS="-bh:5 -O -qmaxmem=-1 -q$BITS $CFLAGS"
3899+
LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"
3900+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)" >&5
3901+
$as_echo "using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)" >&6; }
39013902
;;
39023903
g++ | gcc)
39033904
CPPFLAGS="-x c++ -std=c++11 -frtti $CPPFLAGS "

src/configure.ac

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ AC_SUBST(OBJECTS,$OBJECTS)
4040
AC_MSG_CHECKING([for specific $CXX compiler options])
4141
case "$CXX" in
4242
xlC_r | xlC)
43-
CFLAGS="-bh:5 -q$bits -O $CFLAGS"
44-
CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert::rvaluereferences:rvaluereferences -qwarn0x -qsourcetype=c++ $CPPFLAGS"
45-
AC_MSG_RESULT([yes])
43+
CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
44+
CFLAGS="-bh:5 -O -qmaxmem=-1 -q$BITS $CFLAGS"
45+
LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"
46+
AC_MSG_RESULT([using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)])
4647
;;
4748
g++ | gcc)
4849
CPPFLAGS="-x c++ -std=c++11 -frtti $CPPFLAGS "

tests/configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3744,9 +3744,9 @@ case "$CXX" in
37443744
xlC_r | xlC)
37453745
CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
37463746
CFLAGS="-bh:5 -O -qmaxmem=-1 -q$BITS $CFLAGS"
3747-
# LDFLAGS="$LDFLASG -brtl -bmaxdata:0x80000000"
3748-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3749-
$as_echo "yes" >&6; }
3747+
LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"
3748+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)" >&5
3749+
$as_echo "using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)" >&6; }
37503750
;;
37513751
g++ | gcc)
37523752
CPPFLAGS="-x c++ -std=c++11 -frtti $CPPFLAGS "

tests/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ case "$CXX" in
4242
CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
4343
CFLAGS="-bh:5 -O -qmaxmem=-1 -q$BITS $CFLAGS"
4444
LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"
45-
AC_MSG_RESULT([yes])
45+
AC_MSG_RESULT([using large memory model (maxdata:0x80000000), optimising level 2 (-O),using run-time link method (-brtl)])
4646
;;
4747
g++ | gcc)
4848
CPPFLAGS="-x c++ -std=c++11 -frtti $CPPFLAGS "

0 commit comments

Comments
 (0)