Skip to content

Commit 777c9f4

Browse files
authored
Properly respect CFLAGS. (#3)
This updates the configure script to properly respect any $CFLAGS value in the build environment. This is required for a number of fixes in the agent build.
1 parent e95874a commit 777c9f4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

configure.ac

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ AC_ARG_ENABLE(32-bit, [ --enable-32-bit Generate code for a 32-bit env
185185
if test "x$b32" != xno; then
186186
AC_MSG_RESULT(Configured to Build 32-bit)
187187
if test "x$GCC" = xyes; then
188-
CFLAGS="-UJU_64BIT -m32"
188+
CFLAGS="$CFLAGS -UJU_64BIT -m32"
189189
else
190190
CFLAGS="-UJU_64BIT"
191191
fi
@@ -196,7 +196,7 @@ AC_ARG_ENABLE(64-bit, [ --enable-64-bit Generate code for a 64-bit env
196196
if test "x$b64" != xno; then
197197
AC_MSG_RESULT(Configured to Building 64-bit)
198198
if test "x$GCC" = xyes; then
199-
CFLAGS="-DJU_64BIT -m64"
199+
CFLAGS="$CFLAGS -DJU_64BIT -m64"
200200
else
201201
CFLAGS="-DJU_64BIT"
202202
fi
@@ -208,10 +208,10 @@ if test "x$b64" = xno -a "x$b32" = xno; then
208208
AC_CHECK_SIZEOF(void *)
209209
if test "$ac_cv_sizeof_void_p" = 8; then
210210
AC_MSG_RESULT(Detected 64-bit Build Environment)
211-
CFLAGS="-DJU_64BIT"
211+
CFLAGS="$CFLAGS -DJU_64BIT"
212212
else
213213
AC_MSG_RESULT(Detected 32-bit Build Environment)
214-
CFLAGS="-UJU_64BIT"
214+
CFLAGS="$CFLAGS -UJU_64BIT"
215215
fi
216216
fi
217217

0 commit comments

Comments
 (0)