Skip to content

Commit

Permalink
werror
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilipDeegan committed Aug 11, 2024
1 parent 23d048c commit 7764e2d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_many_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container: quay.io/pypa/manylinux2014_x86_64
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ CXXFLAGS=-std=c++17 -O2 -Wall -fmessage-length=0 -fPIC -Iinc \
-Iext/mkn/kul/inc \
-Iext/mkn/kul/os/$(OS)/inc \
-Iext/mkn/kul/os/nixish/inc
LDFLAGS = -pthread -rdynamic -Wl,--no-as-needed -ldl
LDFLAGS = -pthread -rdynamic -ldl

entry:
@@echo "Options include"
@@echo "make nix"
@@echo "make bsd"

nix:
$(MAKE) build OS=nix
$(MAKE) build OS=nix LDFLAGS="-pthread -rdynamic -Wl,--no-as-needed -ldl"

bsd:
$(MAKE) build OS=bsd
Expand Down
3 changes: 1 addition & 2 deletions mkn.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#! clean build test -dtKOW 9 -g 0 -q

name: mkn
# scm: https://github.com/mkn/mkn
version: master
property:
DATE: 06-APR-2024
DATE: 11-AUG-2024

parent: bin
mode: none
Expand Down
2 changes: 1 addition & 1 deletion src/maiken/depmod.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ mkn::kul::Dir maiken::Application::resolveDepOrModDirectory(YAML::Node const& n,
d = (*AppVars::INSTANCE().properkeys().find(module ? "MKN_MOD_REPO" : "MKN_REPO")).second;
try {
mkn::kul::File verFile(depName, ".mkn/dep/ver");
auto resolveSCMBranch = [=]() -> std::string {
auto resolveSCMBranch = [&]() -> std::string {
if (n[STR_VERSION]) return Properties::RESOLVE(*this, n[STR_VERSION].Scalar());
if (verFile) return mkn::kul::io::Reader(verFile).readLine();
{
Expand Down

0 comments on commit 7764e2d

Please sign in to comment.