diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-02-20 17:50:57 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2020-02-21 18:01:48 +0100 |
| commit | 69fc8b8fc17e39a9fa17d8ace246e617c698fce0 (patch) | |
| tree | 16de5929cf70b06f2b0e5c34feea7fbac9bc4925 | |
| parent | 6d741ffba8b06e714b257d285f64594501812594 (diff) | |
| download | abuild-69fc8b8fc17e39a9fa17d8ace246e617c698fce0.tar.bz2 abuild-69fc8b8fc17e39a9fa17d8ace246e617c698fce0.tar.xz | |
newapkbuild: use 'plain' buildtype for meson and 'None' buildtype for CMake
This way Meson and CMake will use the C{,PP,XX}FLAGS we've set in
`/etc/abuild.conf`. Without this change CMake and meson will overwrite
our CFLAGS with custom flags. Most importantly, they prefer -O1/-O2 over
our -Os.
See also: https://lists.alpinelinux.org/~alpine/devel/%3C2896c13070c508a49cbaa72c8fb7f34ea947358b.camel%40cogitri.dev%3E
| -rw-r--r-- | newapkbuild.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/newapkbuild.in b/newapkbuild.in index 26724f5..aeaff14 100644 --- a/newapkbuild.in +++ b/newapkbuild.in @@ -65,7 +65,7 @@ build_cmake() { -DCMAKE_INSTALL_PREFIX=/usr \\ -DCMAKE_INSTALL_LIBDIR=lib \\ -DBUILD_SHARED_LIBS=True \\ - -DCMAKE_BUILD_TYPE=Release \\ + -DCMAKE_BUILD_TYPE=None \\ -DCMAKE_CXX_FLAGS="\$CXXFLAGS" \\ -DCMAKE_C_FLAGS="\$CFLAGS" \\ \${CMAKE_CROSSOPTS} . @@ -85,7 +85,7 @@ build_meson() { --sysconfdir=/etc \\ --mandir=/usr/share/man \\ --localstatedir=/var \\ - --buildtype=release \\ + --buildtype=plain \\ . output ninja -C output __EOF__ |