rpms/mingw-filesystem
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Accept empty MINGW{32,64}_{C,CPP,CXX}FLAGS environment variables

Browse Source
This commit is contained in:
Erik van Pienbroek 2015-04-10 21:42:16 +02:00
parent 2031da5ebb
commit 64394b95aa
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
macros.mingw32
View File

@ -63,11 +63,11 @@
done; \ done; \
unset _PREFIX; \ unset _PREFIX; \
CC="${MINGW32_CC:-%mingw32_cc}"; export CC; \ CC="${MINGW32_CC:-%mingw32_cc}"; export CC; \
CFLAGS="${MINGW32_CFLAGS:-%mingw32_cflags}"; export CFLAGS; \ CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \
CPPFLAGS="${MINGW32_CPPFLAGS:-%mingw32_cppflags}"; export CPPFLAGS; \ CPPFLAGS="${MINGW32_CPPFLAGS-%mingw32_cppflags}"; export CPPFLAGS; \
if [ -x "%{_bindir}/%{mingw32_cxx}" ]; then \ if [ -x "%{_bindir}/%{mingw32_cxx}" ]; then \
CXX="${MINGW32_CXX:-%mingw32_cxx}"; export CXX; \ CXX="${MINGW32_CXX:-%mingw32_cxx}"; export CXX; \
CXXFLAGS="${MINGW32_CXXFLAGS:-%mingw32_cflags}"; export CXXFLAGS; \ CXXFLAGS="${MINGW32_CXXFLAGS-%mingw32_cflags}"; export CXXFLAGS; \
else \ else \
CXX=; export CXX; \ CXX=; export CXX; \
ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \ ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \

6
macros.mingw64
View File

@ -63,11 +63,11 @@
done; \ done; \
unset _PREFIX; \ unset _PREFIX; \
CC="${MINGW64_CC:-%mingw64_cc}"; export CC; \ CC="${MINGW64_CC:-%mingw64_cc}"; export CC; \
CFLAGS="${MINGW64_CFLAGS:-%mingw64_cflags}"; export CFLAGS; \ CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \
CPPFLAGS="${MINGW64_CPPFLAGS:-%mingw64_cppflags}"; export CPPFLAGS; \ CPPFLAGS="${MINGW64_CPPFLAGS-%mingw64_cppflags}"; export CPPFLAGS; \
if [ -x "%{_bindir}/%{mingw64_cxx}" ]; then \ if [ -x "%{_bindir}/%{mingw64_cxx}" ]; then \
CXX="${MINGW64_CXX:-%mingw64_cxx}"; export CXX; \ CXX="${MINGW64_CXX:-%mingw64_cxx}"; export CXX; \
CXXFLAGS="${MINGW64_CXXFLAGS:-%mingw64_cflags}"; export CXXFLAGS; \ CXXFLAGS="${MINGW64_CXXFLAGS-%mingw64_cflags}"; export CXXFLAGS; \
else \ else \
CXX=; export CXX; \ CXX=; export CXX; \
ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \ ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \

1
mingw-filesystem.spec
View File

@ -330,6 +330,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
* Don't set LIB_INSTALL_DIR any more in the CMake macros * Don't set LIB_INSTALL_DIR any more in the CMake macros
as it breaks CPack and isn't needed by any of the as it breaks CPack and isn't needed by any of the
Fedora MinGW packages (RHBZ #1152696) Fedora MinGW packages (RHBZ #1152696)
- Accept empty MINGW{32,64}_{C,CPP,CXX}FLAGS environment variables
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild