Commit d4596bae authored by Ondřej Surý's avatar Ondřej Surý
Browse files

Pull the values for LFS_{CFLAGS,LDFLAGS,LIBS} from autoconf instead using them directly in make

parent 4419d7bf
Pipeline #15204 passed with stages
in 13 minutes and 15 seconds
......@@ -363,9 +363,6 @@
/* Define to 1 if you have the `setresuid' function. */
#undef HAVE_SETRESUID
/* Define to 1 if you have the `sigwait' function. */
#undef HAVE_SIGWAIT
/* define if struct stat has st_mtim.tv_nsec field */
#undef HAVE_STAT_NSEC
......
......@@ -804,6 +804,9 @@ FGREP
SED
LIBTOOL
SET_MAKE
LFS_LIBS
LFS_LDFLAGS
LFS_CFLAGS
EGREP
GREP
CPP
......@@ -4171,6 +4174,14 @@ $as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
fi
LFS_CFLAGS=`getconf LFS_CFLAGS 2>/dev/null`
LFS_LDFLAGS=`getconf LFS_LDFLAGS 2>/dev/null`
LFS_LIBS=`getconf LFS_LIBS 2>/dev/null`
# Enable RFC 3542 APIs on macOS
$as_echo "#define __APPLE_USE_RFC_3542 1" >>confdefs.h
......
......@@ -26,6 +26,14 @@ AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
AC_FUNC_FSEEKO
LFS_CFLAGS=`getconf LFS_CFLAGS 2>/dev/null`
LFS_LDFLAGS=`getconf LFS_LDFLAGS 2>/dev/null`
LFS_LIBS=`getconf LFS_LIBS 2>/dev/null`
AC_SUBST([LFS_CFLAGS])
AC_SUBST([LFS_LDFLAGS])
AC_SUBST([LFS_LIBS])
# Enable RFC 3542 APIs on macOS
AC_DEFINE([__APPLE_USE_RFC_3542], [1], [Select RFC3542 IPv6 API on macOS])
......
......@@ -167,9 +167,6 @@ include/dns/rdatastruct.h: gen \
code.h: gen
./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
gen: LFS_CFLAGS = `getconf LFS_CFLAGS 2>/dev/null`
gen: LFS_LDFLAGS = `getconf LFS_LDFLAGS 2>/dev/null`
gen: LFS_LIBS = `getconf LFS_LIBS 2>/dev/null`
gen: gen.c
${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
${LFS_CFLAGS} ${LFS_LDFLAGS} \
......
......@@ -116,6 +116,10 @@ BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
BUILD_LDFLAGS = @BUILD_LDFLAGS@
BUILD_LIBS = @BUILD_LIBS@
LFS_CFLAGS = @LFS_CFLAGS@
LFS_LDFLAGS = @LFS_LDFLAGS@
LFS_LIBS = @LFS_LIBS@
.SUFFIXES:
.SUFFIXES: .c .@O@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment