summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2021-10-11 22:18:24 +0200
committerAdrian Kummerlaender2021-10-11 22:18:24 +0200
commit44c1837717f748b891df1a6c88a72ec3a51470ce (patch)
tree59934ad814012c2bbc5cd0c3820b12be33cf651f
parentff42cd0804d2e296742b43716b479790761cb5a6 (diff)
downloadteensy-env-44c1837717f748b891df1a6c88a72ec3a51470ce.tar
teensy-env-44c1837717f748b891df1a6c88a72ec3a51470ce.tar.gz
teensy-env-44c1837717f748b891df1a6c88a72ec3a51470ce.tar.bz2
teensy-env-44c1837717f748b891df1a6c88a72ec3a51470ce.tar.lz
teensy-env-44c1837717f748b891df1a6c88a72ec3a51470ce.tar.xz
teensy-env-44c1837717f748b891df1a6c88a72ec3a51470ce.tar.zst
teensy-env-44c1837717f748b891df1a6c88a72ec3a51470ce.zip
Pull library build into MakefileHEADmaster
-rw-r--r--Makefile.lib5
-rw-r--r--core.nix1
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
'';