Skip to content

Commit

Permalink
Capture ./configure CPPFLAGS for future, automatic runs
Browse files Browse the repository at this point in the history
The value should now be captured in config/config.cmd alongside the
others.

Thanks to Greg Troxel for reporting the omission.

Signed-off-by: Rob Browning <[email protected]>
Tested-by: Rob Browning <[email protected]>
  • Loading branch information
rlbdv committed Jul 11, 2022
1 parent 6f0a4bf commit 386a280
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion config/configure.inc
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,7 @@ AC_OUTPUT () {
AC_SUB 'GENERATED_FILES' "$*"
AC_SUB 'CFLAGS' "$AC_CFLAGS"
AC_SUB 'FCFLAGS' "$AC_FCFLAGS"
AC_SUB 'CPPFLAGS' "$AC_CPPFLAGS"
AC_SUB 'CXXFLAGS' "$AC_CXXFLAGS"
AC_SUB 'LDFLAGS' "$AC_LDFLAGS"
AC_SUB 'srcdir' "$AC_SRCDIR"
Expand All @@ -990,7 +991,7 @@ AC_OUTPUT () {
Q=\'
cat - > config.cmd << EOF
#! /bin/sh
${CXX:+CXX=${Q}${CXX}${Q}} ${CXXFLAGS:+CXXFLAGS=${Q}${CXXFLAGS}${Q}} ${FC:+FC=${Q}${FC}${Q}} ${FCFLAGS:+FCFLAGS=${Q}${FCFLAGS}${Q}} ${CC:+CC=${Q}${CC}${Q}} ${CFLAGS:+CFLAGS=${Q}${CFLAGS}${Q}} $ac_progname $ac_configure_command
${CXX:+CXX=${Q}${CXX}${Q}} ${CPPFLAGS:+CPPFLAGS=${Q}${CPPFLAGS}${Q}} ${CXXFLAGS:+CXXFLAGS=${Q}${CXXFLAGS}${Q}} ${FC:+FC=${Q}${FC}${Q}} ${FCFLAGS:+FCFLAGS=${Q}${FCFLAGS}${Q}} ${CC:+CC=${Q}${CC}${Q}} ${CFLAGS:+CFLAGS=${Q}${CFLAGS}${Q}} $ac_progname $ac_configure_command
EOF
chmod +x config.cmd

Expand Down

0 comments on commit 386a280

Please sign in to comment.