Skip to content

Commit a7c5e9e

Browse files
author
Lawrence Nahum
committed
prepend build flags
1 parent 0d06449 commit a7c5e9e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

configure.ac

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ AM_CONDITIONAL([IS_OSX], [test "x$is_osx" == "xyes"])
2121
AC_SUBST([LDPATH_VAR])
2222

2323
AM_INIT_AUTOMAKE([foreign subdir-objects])
24+
: ${CFLAGS="-g"}
2425
LT_INIT([disable-static])
2526

2627
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -140,14 +141,14 @@ if test "x$debug" == "xyes"; then
140141
fi
141142
else
142143
# Optimise and harden if we can
143-
AX_CHECK_COMPILE_FLAG([-O2], [AM_CFLAGS="$AM_CFLAGS -O2"])
144+
AX_CHECK_COMPILE_FLAG([-O2], [AM_CFLAGS="-O2 $AM_CFLAGS"])
144145
AC_CHECK_DEFINE([_FORTIFY_SOURCE], [], [
145146
AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2],
146147
[CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"])
147148
])
148149
AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [AM_CFLAGS="$AM_CFLAGS -fstack-protector-strong"])
149150
AX_CHECK_COMPILE_FLAG([-DNDEBUG=1], [AM_CFLAGS="$AM_CFLAGS -DNDEBUG=1"])
150-
AX_CHECK_LINK_FLAG([-O2], [LDFLAGS="$LDFLAGS -O2"])
151+
AX_CHECK_LINK_FLAG([-O2], [LDFLAGS="-O2 $LDFLAGS"])
151152
AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"])
152153
fi
153154

0 commit comments

Comments
 (0)