From 44c1837717f748b891df1a6c88a72ec3a51470ce Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Mon, 11 Oct 2021 22:18:24 +0200 Subject: Pull library build into Makefile --- Makefile.lib | 5 ++++- core.nix | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index d776318..80892cb 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -11,4 +11,7 @@ C_FILES := $(wildcard *.c) CPP_FILES := $(wildcard *.cpp) OBJS := $(C_FILES:.c=.o) $(CPP_FILES:.cpp=.o) -all: $(OBJS) \ No newline at end of file +libteensy-core.a: $(OBJS) + ar rvs $@ $(OBJS) + +all: libteensy-core.a \ No newline at end of file diff --git a/core.nix b/core.nix index a67e83d..1faaffe 100644 --- a/core.nix +++ b/core.nix @@ -34,7 +34,6 @@ pkgs.stdenvNoCC.mkDerivation rec { ${copyLibs libs} make - ar rvs libteensy-core.a *.o popd ''; -- cgit v1.2.3