diff options
| author | Nicola Murino | 2020-05-18 23:23:37 +0200 |
|---|---|---|
| committer | Nicola Murino | 2020-05-18 23:23:37 +0200 |
| commit | f738247c821b57f3fc7839aa8f9f37de7de1515b (patch) | |
| tree | 4deca1e10939ac9f51b48a7dc3f141dc6315054d | |
| parent | 787b3df407aeec6255bebf59960881312039db9c (diff) | |
| download | aur-f738247c821b57f3fc7839aa8f9f37de7de1515b.tar.gz | |
toolchain generator: don't crash if *FLAGS aren't set
see usage in mingw-w64-libsoup 2.70.0
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rwxr-xr-x | toolchain_generator.py | 6 |
3 files changed, 7 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = mingw-w64-meson pkgdesc = Meson wrapper for MinGW (mingw-w64) pkgver = 1 - pkgrel = 18 + pkgrel = 19 url = http://fedoraproject.org/wiki/MinGW arch = any license = GPL @@ -13,7 +13,7 @@ pkgbase = mingw-w64-meson optdepends = mingw-w64-cmake source = toolchain_generator.py source = meson-mingw-wrapper - sha256sums = eccc039b3d46cc6ed3f48d526c9434a28da80caa88d0d7240866ab7d0370d164 + sha256sums = a598c4f27b4a03063c5515ee2ffb7213ea969f6c64d88979f55c0542729b6b80 sha256sums = c91f2bbcafad7b742f13c6bd46324a03b70066b348621ce6a20f4a05005985ef pkgname = mingw-w64-meson @@ -1,7 +1,7 @@ # Maintainer: drakkan <nicola.murino at gmail dot com> pkgname=mingw-w64-meson pkgver=1 -pkgrel=18 +pkgrel=19 arch=('any') pkgdesc="Meson wrapper for MinGW (mingw-w64)" depends=('meson' 'mingw-w64-gcc' 'mingw-w64-pkg-config') @@ -12,7 +12,7 @@ license=("GPL") url="http://fedoraproject.org/wiki/MinGW" source=("toolchain_generator.py" "meson-mingw-wrapper") -sha256sums=('eccc039b3d46cc6ed3f48d526c9434a28da80caa88d0d7240866ab7d0370d164' +sha256sums=('a598c4f27b4a03063c5515ee2ffb7213ea969f6c64d88979f55c0542729b6b80' 'c91f2bbcafad7b742f13c6bd46324a03b70066b348621ce6a20f4a05005985ef') _architectures="i686-w64-mingw32 x86_64-w64-mingw32" diff --git a/toolchain_generator.py b/toolchain_generator.py index 75e8e34539b3..b9ebb5fcf867 100755 --- a/toolchain_generator.py +++ b/toolchain_generator.py @@ -10,9 +10,9 @@ class CrossFileGenerator: self.arch = arch self.output_file = output_file self.need_exe_wrapper = need_exe_wrapper - self.cflags = os.environ["CFLAGS"] - self.cxxflags = os.environ["CXXFLAGS"] - self.ldflags = os.environ["LDFLAGS"] + self.cflags = os.environ['CFLAGS'] if 'CFLAGS' in os.environ else '' + self.cxxflags = os.environ["CXXFLAGS"] if 'CXXFLAGS' in os.environ else '' + self.ldflags = os.environ["LDFLAGS"] if 'LDFLAGS' in os.environ else '' if self.arch == 'i686-w64-mingw32': self.cpu_family = "x86" self.processor = 'i686' |