From eafc5e9df6b316e0f9804b73e43d25f72f2c1d79 Mon Sep 17 00:00:00 2001 From: Aaron Kaiser Date: Wed, 3 Apr 2024 16:42:01 +0200 Subject: [PATCH] Build library --- Makefile | 10 +++++----- default.nix | 10 +++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 33f2d57..0bc96a2 100644 --- a/Makefile +++ b/Makefile @@ -7,14 +7,14 @@ MAKE ?= make all: build @true -build: build/agent.S - $(CC) build/agent.S -o build/agent +build: build/agent.o + ar -crs build/libagent.a build/agent.o + +build/%.o: build/%.S + $(CC) $< -c -o $@ clean: rm build/* 2> /dev/null || true build/%.S: src/%.jazz JASMINPATH="Jade=libjade/src/" $(JC) $< -o $@ - -run: build - build/agent diff --git a/default.nix b/default.nix index 2aa9282..f923614 100644 --- a/default.nix +++ b/default.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation { name = "x25519-agent"; - src = nix-gitignore.gitignoreSource [] ./.; + src = nix-gitignore.gitignoreSource [ ] ./.; nativeBuildInputs = [ gnumake @@ -20,8 +20,12 @@ stdenv.mkDerivation { jasmin ]; + configurePhase = '' + mkdir build + ''; + installPhase = '' - mkdir $out - cp build/agent $out + mkdir -p $out/lib + cp build/libagent.a $out/lib ''; }