diff options
author | Michel Zou | 2019-12-02 19:27:38 +0100 |
---|---|---|
committer | Michel Zou | 2019-12-02 19:27:38 +0100 |
commit | eb9c304ca784c0d346c9fe4a49163e2841f788d2 (patch) | |
tree | 0e286c09c05f4a56fbdf0f61468670ebb38d0f03 /mingw-cmake.sh | |
parent | fe3c09055b4d210e65a6dac4e2f37f81e5b39859 (diff) | |
download | aur-eb9c304ca784c0d346c9fe4a49163e2841f788d2.tar.gz |
Revert "clear default flags"
This reverts commit fe3c09055b4d210e65a6dac4e2f37f81e5b39859.
Diffstat (limited to 'mingw-cmake.sh')
-rw-r--r-- | mingw-cmake.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mingw-cmake.sh b/mingw-cmake.sh index d801a1a1d470..46d3fe234ef1 100644 --- a/mingw-cmake.sh +++ b/mingw-cmake.sh @@ -3,9 +3,11 @@ mingw_prefix=/usr/@TRIPLE@ export PKG_CONFIG_LIBDIR="${mingw_prefix}/lib/pkgconfig" -default_mingw_compiler_flags="-D_FORTIFY_SOURCE=2 -O2 -pipe -fno-plt -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 -fstack-protector" +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}" @@ -21,7 +23,6 @@ PATH=${mingw_prefix}/bin:$PATH cmake \ -DCMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES:PATH=${mingw_prefix}/include \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE=/usr/share/mingw/toolchain-@TRIPLE@.cmake \ - -DCMAKE_USER_MAKE_RULES_OVERRIDE=/usr/share/mingw/override-@TRIPLE@.cmake \ -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/@TRIPLE@-wine \ -DCMAKE_BUILD_TYPE=Release \ "$@" |