Skip to content

Commit f38fdad

Browse files
committed
opal_configure_options: disable debug-by-default builds for devs
After 11 years, it's probably ok to say that we're no longer in "early development" -- disable the "build a debug version of Open MPI by default if we find a .git directory" behavior.
1 parent 0c92a0d commit f38fdad

File tree

1 file changed

+1
-37
lines changed

1 file changed

+1
-37
lines changed

config/opal_configure_options.m4

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
1010
dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
13-
dnl Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved.
13+
dnl Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
1414
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
1515
dnl Copyright (c) 2009 IBM Corporation. All rights reserved.
1616
dnl Copyright (c) 2009 Los Alamos National Security, LLC. All rights
@@ -32,17 +32,6 @@ AC_DEFUN([OPAL_CONFIGURE_OPTIONS],[
3232
opal_show_subtitle "OPAL Configuration options"
3333

3434

35-
#
36-
# Is this a developer copy?
37-
#
38-
39-
if test -d .git; then
40-
OPAL_DEVEL=1
41-
else
42-
OPAL_DEVEL=0
43-
fi
44-
45-
4635
#
4736
# Code coverage options
4837
#
@@ -100,12 +89,6 @@ else
10089
AC_MSG_RESULT([no])
10190
WANT_MEM_DEBUG=0
10291
fi
103-
#################### Early development override ####################
104-
if test "$WANT_MEM_DEBUG" = "0" && test -z "$enable_mem_debug" && test "$OPAL_DEVEL" = 1; then
105-
WANT_MEM_DEBUG=1
106-
echo "--> developer override: enable mem profiling by default"
107-
fi
108-
#################### Early development override ####################
10992
AC_DEFINE_UNQUOTED(OPAL_ENABLE_MEM_DEBUG, $WANT_MEM_DEBUG,
11093
[Whether we want the memory profiling or not])
11194

@@ -124,12 +107,6 @@ else
124107
AC_MSG_RESULT([no])
125108
WANT_MEM_PROFILE=0
126109
fi
127-
#################### Early development override ####################
128-
if test "$WANT_MEM_PROFILE" = "0" && test -z "$enable_mem_profile" && test "$OPAL_DEVEL" = 1; then
129-
WANT_MEM_PROFILE=1
130-
echo "--> developer override: enable mem profiling by default"
131-
fi
132-
#################### Early development override ####################
133110
AC_DEFINE_UNQUOTED(OPAL_ENABLE_MEM_PROFILE, $WANT_MEM_PROFILE,
134111
[Whether we want the memory profiling or not])
135112

@@ -148,12 +125,6 @@ else
148125
AC_MSG_RESULT([no])
149126
WANT_PICKY_COMPILER=0
150127
fi
151-
#################### Early development override ####################
152-
if test "$WANT_PICKY_COMPILER" = "0" && test -z "$enable_picky" && test "$OPAL_DEVEL" = 1; then
153-
WANT_PICKY_COMPILER=1
154-
echo "--> developer override: enable picky compiler by default"
155-
fi
156-
#################### Early development override ####################
157128

158129
#
159130
# Developer debugging
@@ -190,13 +161,6 @@ AC_DEFINE_UNQUOTED(OPAL_ENABLE_TIMING, $WANT_TIMING,
190161
AM_CONDITIONAL([OPAL_COMPILE_TIMING], [test "$WANT_TIMING" = "1"])
191162
AM_CONDITIONAL([OPAL_INSTALL_TIMING_BINARIES], [test "$WANT_TIMING" = "1" && test "$enable_binaries" != "no"])
192163

193-
194-
#################### Early development override ####################
195-
if test "$WANT_DEBUG" = "0" && test -z "$enable_debug" && test "$OPAL_DEVEL" = 1; then
196-
WANT_DEBUG=1
197-
echo "--> developer override: enable debugging code by default"
198-
fi
199-
#################### Early development override ####################
200164
if test "$WANT_DEBUG" = "0"; then
201165
CFLAGS="-DNDEBUG $CFLAGS"
202166
CXXFLAGS="-DNDEBUG $CXXFLAGS"

0 commit comments

Comments
 (0)