Skip to content

Commit

Permalink
Revert "Add easy to use --enable-static=yes option"
Browse files Browse the repository at this point in the history
This reverts commit 53b6e46.
  • Loading branch information
pantoniou committed Jun 25, 2024
1 parent 53b6e46 commit 075008f
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,9 @@ fi
# need that as conditional because some internal tools compile as static
# to have access to internal libfyaml APIs
if test "x$enable_static" = "xyes" ; then
HAVE_STATIC=1
CFLAGS="$CFLAGS -static --static"
HAVE_STATIC=1
else
HAVE_STATIC=0
HAVE_STATIC=0
fi
AC_SUBST(HAVE_STATIC)
AC_DEFINE_UNQUOTED([HAVE_STATIC], [$HAVE_STATIC], [Define to 1 if static linking is available])
Expand Down Expand Up @@ -209,11 +208,7 @@ AC_ARG_ENABLE([asan],
HAVE_ASAN=0
ASAN_CFLAGS=""
ASAN_LIBS=""
if test "x$enable_static" = "xyes" ; then

AC_MSG_WARN([static compilation is incompatible with ASAN; ASAN disabled])

elif test "x$enable_asan" == "xyes" ; then
if test "x$enable_asan" == "xyes" ; then
AC_MSG_CHECKING([location of ASAN library])
ASANLIB1=`${CC} -print-file-name=libasan.so`
ASANLIB=`readlink -f "${ASANLIB1}"`
Expand All @@ -223,8 +218,8 @@ elif test "x$enable_asan" == "xyes" ; then
ASAN_LIBS="-fsanitize=address"
AC_MSG_RESULT([$ASANLIB])
m4_version_prereq(2.64,
AX_APPEND_COMPILE_FLAGS([${ASAN_CFLAGS}], [CFLAGS]),
[CFLAGS="$CFLAGS $ASAN_CFLAGS"])
AX_APPEND_COMPILE_FLAGS([-fsanitize=address -fno-omit-frame-pointer], [CFLAGS]),
[CFLAGS="$CFLAGS -fsanitize=address -fno-omit-frame-pointer"])
else
AC_MSG_RESULT([Not found; disabling ASAN])
fi
Expand Down

0 comments on commit 075008f

Please sign in to comment.