diff options
Diffstat (limited to 'macros.cygwin32')
| -rw-r--r-- | macros.cygwin32 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/macros.cygwin32 b/macros.cygwin32 index 7330796..d3042cf 100644 --- a/macros.cygwin32 +++ b/macros.cygwin32 @@ -23,7 +23,9 @@ # Build macros. %cygwin32_host %{cygwin32_target} -%cygwin32_cflags -O2 -g -pipe -Wall +%cygwin32_cflags %{cygwin32_cppflags} -O2 -g -pipe -Wall +%cygwin32_cppflags %{nil} +%cygwin32_ldflags %{nil} %cygwin32_cc %{cygwin32_target}-gcc %cygwin32_cxx %{cygwin32_target}-g++ @@ -88,16 +90,18 @@ package or when debugging this package. \ declare -x $x="$i" ; export $x; \ done; \ unset _PREFIX; \ - CC="${cygwin_CC:-%cygwin32_cc}"; export CC; \ - CFLAGS="${cygwin_CFLAGS:-%cygwin32_cflags}"; export CFLAGS; \ + CC="${CYGWIN32_CC:-%cygwin32_cc}"; export CC; \ + CFLAGS="${CYGWIN32_CFLAGS:-%cygwin32_cflags}"; export CFLAGS; \ + CPPFLAGS="${CYGWIN32_CPPFLAGS:-%cygwin32_cppflags}"; export CPPFLAGS; \ if [ -x "%{_bindir}/%{cygwin32_cxx}" ]; then \ - CXX="${cygwin_CXX:-%cygwin32_cxx}"; export CXX; \ - CXXFLAGS="${cygwin_CXXFLAGS:-%cygwin32_cflags}"; export CXXFLAGS; \ + CXX="${CYGWIN32_CXX:-%cygwin32_cxx}"; export CXX; \ + CXXFLAGS="${CYGWIN32_CXXFLAGS:-%cygwin32_cflags}"; export CXXFLAGS; \ else \ CXX=; export CXX; \ ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \ CXXFLAGS=; export CXXFLAGS; \ fi; \ + LDFLAGS="${CYGWIN32_LDFLAGS:-%cygwin32_ldflags}"; export LDFLAGS; \ for i in `ls %{_bindir}/*|grep -- "[-_]config\$"` ; do \ case $i in *pkg-config) continue ; esac ; \ x=`basename $i|tr "a-z+-\." "A-ZX__"`; \ |