diff --git a/packaging/flatpak/net.catcrafts.CrafterBuild.yaml b/packaging/flatpak/net.catcrafts.CrafterBuild.yaml index 8bc886d..01e286e 100644 --- a/packaging/flatpak/net.catcrafts.CrafterBuild.yaml +++ b/packaging/flatpak/net.catcrafts.CrafterBuild.yaml @@ -46,26 +46,14 @@ modules: builddir: true subdir: llvm build-options: - # flatpak-builder's default CFLAGS carry -g. For all of LLVM that is a - # 30 GB build tree and a multi-gigabyte .Debug extension, so build - # without debug info, strip, and skip the split. The hardening flags - # from the defaults stay. + # Debug info for all of LLVM would be a multi-gigabyte .Debug extension. no-debuginfo: true - strip: true - cflags: -O2 -pipe -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -fcf-protection - cflags-override: true - cxxflags: -O2 -pipe -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -fcf-protection - cxxflags-override: true config-opts: - -DCMAKE_BUILD_TYPE=Release - -DLLVM_ENABLE_ASSERTIONS=OFF - -DLLVM_ENABLE_PROJECTS=clang;lld - -DLLVM_ENABLE_RUNTIMES=compiler-rt;libcxx;libcxxabi;libunwind - -DLLVM_TARGETS_TO_BUILD=X86;AArch64;WebAssembly - # Classic layout: libc++ in lib/ and include/c++/v1, not under a - # per-target subdirectory. It is what clang's own default search, the - # rpath crafter-build adds and distro installs all assume. - - -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF # One shared LLVM and one shared clang library instead of a statically # linked copy per tool: a fraction of the install size. - -DLLVM_BUILD_LLVM_DYLIB=ON @@ -127,16 +115,6 @@ modules: builddir: true build-options: no-debuginfo: true - # flatpak-builder's default CFLAGS/LDFLAGS are x86-64 hardening flags - # (-fcf-protection, -z relro) that the nested wasm32 builds inherit - # through the environment and clang rejects for that target. - cflags: "" - cflags-override: true - cxxflags: "" - cxxflags-override: true - ldflags: "" - ldflags-override: true - strip: true config-opts: - -DCMAKE_TOOLCHAIN_FILE=/run/build/wasi-sysroot/wasi-host-toolchain.cmake - -DWASI_SDK_BUILD_TOOLCHAIN=OFF