summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Zou2019-01-05 09:50:29 +0100
committerMichel Zou2019-01-05 09:50:29 +0100
commitfe8d4e5fa3958d2fe3055c62fc2ab5288a80ab1e (patch)
tree09b0f77ff6797314dd639fb603b0067f9f47d269
parent3d87b28cdbf61deb1c47e3aeb1f2d06d1023f088 (diff)
downloadaur-fe8d4e5fa3958d2fe3055c62fc2ab5288a80ab1e.tar.gz
flags: remove -g, add -fno-plt, set ldflags
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--mingw-cmake.sh15
3 files changed, 14 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 74993a83174c..c4e0479f9934 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mingw-w64-cmake
pkgdesc = CMake wrapper for MinGW (mingw-w64)
pkgver = 1
- pkgrel = 23
+ pkgrel = 23.2
url = http://fedoraproject.org/wiki/MinGW
arch = any
license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index e55dc1489c6c..679eca63b876 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
pkgname=mingw-w64-cmake
pkgver=1
-pkgrel=23
+pkgrel=23.2
arch=('any')
pkgdesc="CMake wrapper for MinGW (mingw-w64)"
depends=('cmake' 'mingw-w64-gcc' 'mingw-w64-pkg-config')
diff --git a/mingw-cmake.sh b/mingw-cmake.sh
index 48964dda8e8f..54ad8b6274c1 100644
--- a/mingw-cmake.sh
+++ b/mingw-cmake.sh
@@ -3,7 +3,14 @@ mingw_prefix=/usr/@TRIPLE@
export PKG_CONFIG_LIBDIR="${mingw_prefix}/lib/pkgconfig"
-mingw_c_flags="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+default_mingw_pp_flags="-D_FORTIFY_SOURCE=2"
+default_mingw_compiler_flags="$default_mingw_pp_flags -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4"
+default_mingw_linker_flags="-Wl,-O1,--sort-common,--as-needed"
+
+export CPPFLAGS="${MINGW_CPPFLAGS:-$default_mingw_pp_flags $CPPFLAGS}"
+export CFLAGS="${MINGW_CFLAGS:-$default_mingw_compiler_flags $CFLAGS}"
+export CXXFLAGS="${MINGW_CXXFLAGS:-$default_mingw_compiler_flags $CXXFLAGS}"
+export LDFLAGS="${MINGW_LDFLAGS:-$default_mingw_linker_flags $LDFLAGS}"
PATH=${mingw_prefix}/bin:$PATH cmake \
-DCMAKE_INSTALL_PREFIX:PATH=${mingw_prefix} \
@@ -18,6 +25,8 @@ PATH=${mingw_prefix}/bin:$PATH cmake \
-DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-@TRIPLE@.cmake \
-DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/@TRIPLE@-wine \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_C_FLAGS_RELEASE="$mingw_c_flags $CFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE="$mingw_c_flags $CXXFLAGS" \
+ -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="$LDFLAGS" \
+ -DCMAKE_EXE_LINKER_FLAGS_RELEASE="$LDFLAGS" \
"$@"