1
1

build: Unbreak builds on macOS by not building profiled binaries by default (#950)

Fixes #933.
Этот коммит содержится в:
Bruce A. Mah 2020-01-06 13:43:29 -08:00 коммит произвёл GitHub
родитель 4e9a30bba3
Коммит 4a3efb37da
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 10 добавлений и 10 удалений

8
configure поставляемый
Просмотреть файл

@ -1416,7 +1416,7 @@ Optional Features:
--enable-fast-install[=PKGS] --enable-fast-install[=PKGS]
optimize for fast installation [default=yes] optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds) --disable-libtool-lock avoid locking (might break parallel builds)
--disable-profiling Disable iperf profiling binary --enable-profiling Enable iperf profiling binary
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -12135,12 +12135,12 @@ if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -Wall" CFLAGS="$CFLAGS -Wall"
fi fi
# Check if profiling must be disabled # Check if enable profiling
# Check whether --enable-profiling was given. # Check whether --enable-profiling was given.
if test "${enable_profiling+set}" = set; then : if test "${enable_profiling+set}" = set; then :
enableval=$enable_profiling; : enableval=$enable_profiling; enable_profiling=yes
else else
enable_profiling=yes :
fi fi
if test x$enable_profiling = xyes; then if test x$enable_profiling = xyes; then

Просмотреть файл

@ -52,11 +52,11 @@ if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -Wall" CFLAGS="$CFLAGS -Wall"
fi fi
# Check if profiling must be disabled # Check if enable profiling
AC_ARG_ENABLE([profiling], AC_ARG_ENABLE([profiling],
AS_HELP_STRING([--disable-profiling], [Disable iperf profiling binary]), AS_HELP_STRING([--enable-profiling], [Enable iperf profiling binary]),
[:], [enable_profiling=yes],
[enable_profiling=yes]) [:])
AM_CONDITIONAL([ENABLE_PROFILING], [test x$enable_profiling = xyes]) AM_CONDITIONAL([ENABLE_PROFILING], [test x$enable_profiling = xyes])
# Checks for header files. # Checks for header files.

Просмотреть файл

@ -52,7 +52,7 @@ iperf3_LDADD = libiperf.la
iperf3_LDFLAGS = -g iperf3_LDFLAGS = -g
if ENABLE_PROFILING if ENABLE_PROFILING
# If the iperf-profiled-binary is enabled (and this condition is true by default) # If the iperf-profiled-binary is enabled
# Specify the sources and various flags for the profiled iperf binary. This # Specify the sources and various flags for the profiled iperf binary. This
# binary recompiles all the source files to make sure they are all profiled. # binary recompiles all the source files to make sure they are all profiled.
iperf3_profile_SOURCES = main.c \ iperf3_profile_SOURCES = main.c \

Просмотреть файл

@ -664,7 +664,7 @@ iperf3_CFLAGS = -g
iperf3_LDADD = libiperf.la iperf3_LDADD = libiperf.la
iperf3_LDFLAGS = -g iperf3_LDFLAGS = -g
# If the iperf-profiled-binary is enabled (and this condition is true by default) # If the iperf-profiled-binary is enabled
# Specify the sources and various flags for the profiled iperf binary. This # Specify the sources and various flags for the profiled iperf binary. This
# binary recompiles all the source files to make sure they are all profiled. # binary recompiles all the source files to make sure they are all profiled.
@ENABLE_PROFILING_TRUE@iperf3_profile_SOURCES = main.c \ @ENABLE_PROFILING_TRUE@iperf3_profile_SOURCES = main.c \