diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-10 22:03:54 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowi@redhat.com> | 2015-06-10 22:03:56 -0500 |
| commit | dab1ea74bd5b6910f7717b50b1f49209274c8e44 (patch) | |
| tree | 4723d72b00c2f6805c1adc6fd6e65d3f6bea0884 | |
| parent | b2f0da6d9048b91be54e487d080db051c2f15175 (diff) | |
| download | cygwin-filesystem-dab1ea74bd5b6910f7717b50b1f49209274c8e44.tar.gz cygwin-filesystem-dab1ea74bd5b6910f7717b50b1f49209274c8e44.tar.xz cygwin-filesystem-dab1ea74bd5b6910f7717b50b1f49209274c8e44.zip | |
Allow empty CYGWIN{32,64}_{C,CPP,CXX}FLAGS environment variables
Based on mingw-filesystem commit 64394b95aa6c2e5104d808a35729850b82cc2e1b.
| -rw-r--r-- | cygwin-filesystem.spec | 1 | ||||
| -rw-r--r-- | macros.cygwin32 | 6 | ||||
| -rw-r--r-- | macros.cygwin64 | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/cygwin-filesystem.spec b/cygwin-filesystem.spec index 63a793b..2049e36 100644 --- a/cygwin-filesystem.spec +++ b/cygwin-filesystem.spec @@ -253,6 +253,7 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/cygwin/ - Don't use verbose output by default in the CMake wrapper scripts - Prevent CFLAGS and CXXFLAGS from being set when using CMake wrappers - Don't set LIB_INSTALL_DIR any more in the CMake macros as it breaks CPack +- Allow empty CYGWIN{32,64}_{C,CPP,CXX}FLAGS environment variables * Thu Jun 11 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 12-1 - Add cppflags, ldflags variables diff --git a/macros.cygwin32 b/macros.cygwin32 index edb4188..9131b14 100644 --- a/macros.cygwin32 +++ b/macros.cygwin32 @@ -91,11 +91,11 @@ package or when debugging this package. \ done; \ unset _PREFIX; \ CC="${CYGWIN32_CC:-%cygwin32_cc}"; export CC; \ - CFLAGS="${CYGWIN32_CFLAGS:-%cygwin32_cflags}"; export CFLAGS; \ - CPPFLAGS="${CYGWIN32_CPPFLAGS:-%cygwin32_cppflags}"; export CPPFLAGS; \ + CFLAGS="${CYGWIN32_CFLAGS-%cygwin32_cflags}"; export CFLAGS; \ + CPPFLAGS="${CYGWIN32_CPPFLAGS-%cygwin32_cppflags}"; export CPPFLAGS; \ if [ -x "%{_bindir}/%{cygwin32_cxx}" ]; then \ CXX="${CYGWIN32_CXX:-%cygwin32_cxx}"; export CXX; \ - CXXFLAGS="${CYGWIN32_CXXFLAGS:-%cygwin32_cflags}"; export CXXFLAGS; \ + CXXFLAGS="${CYGWIN32_CXXFLAGS-%cygwin32_cflags}"; export CXXFLAGS; \ else \ CXX=; export CXX; \ ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \ diff --git a/macros.cygwin64 b/macros.cygwin64 index 4b51f8e..f10534d 100644 --- a/macros.cygwin64 +++ b/macros.cygwin64 @@ -92,11 +92,11 @@ package or when debugging this package. \ done; \ unset _PREFIX; \ CC="${CYGWIN64_CC:-%cygwin64_cc}"; export CC; \ - CFLAGS="${CYGWIN64_CFLAGS:-%cygwin64_cflags}"; export CFLAGS; \ - CPPFLAGS="${CYGWIN64_CPPFLAGS:-%cygwin64_cppflags}"; export CPPFLAGS; \ + CFLAGS="${CYGWIN64_CFLAGS-%cygwin64_cflags}"; export CFLAGS; \ + CPPFLAGS="${CYGWIN64_CPPFLAGS-%cygwin64_cppflags}"; export CPPFLAGS; \ if [ -x "%{_bindir}/%{cygwin64_cxx}" ]; then \ CXX="${CYGWIN64_CXX:-%cygwin64_cxx}"; export CXX; \ - CXXFLAGS="${CYGWIN64_CXXFLAGS:-%cygwin64_cflags}"; export CXXFLAGS; \ + CXXFLAGS="${CYGWIN64_CXXFLAGS-%cygwin64_cflags}"; export CXXFLAGS; \ else \ CXX=; export CXX; \ ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \ |