Attempt to set the aarch64 ld library

[rbdr/lyricli] / Makefile

diff --git a/Makefile b/Makefile
index 4d414c84ac6a80ed4a98ac14b9fd309494d215a1..516f47e562eb8ffebe5828f5969dfd824c3320c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@ profile := dev
 target = $(shell rustc -vV | grep host | awk '{print $$2}')
 architectures := x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
 app_name := lrc
+long_app_name := lyricli
+host_architecture := $(target)
 
 default: build
 
@@ -12,6 +14,13 @@ prepare:
        rustup target add $(target)
 
 build: prepare
+# I need an actually configurable way to make this work. Right now i'm only
+# cross compiling in the CI, and I know what I'm running, but
+ifeq ($(host_architecture), x86_64-unknown-linux-gnu)
+ifeq ($(target), aarch64-unknown-linux-gnu)
+    LD_LIBRARY_PATH=/usr/local/aarch64-linux-gnu/lib:${LD_LIBRARY_PATH}
+endif
+endif
        @export $$(cat .env | xargs) > /dev/null 2>&1 && cargo build --profile $(profile) --target $(target)
 
 release: rpm tar deb
@@ -25,30 +34,43 @@ else
 endif
 
 deb: build
+ifeq ($(findstring linux,$(target)),linux)
        @$(eval filename := $(app_name)-$(target)-$(channel))
-       cargo deb --profile $(profile) --target $(target)
+       @export $$(cat .env | xargs) > /dev/null 2>&1 && cargo deb --profile $(profile) --target $(target)
        mv target/$(target)/debian/*.deb $(filename).deb
        sha256sum $(filename).deb > $(filename).deb.sha256
-       rsync -avz $(filename).deb deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
-       rsync -avz $(filename).deb.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+       rsync -avz $(filename).deb deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(long_app_name)
+       rsync -avz $(filename).deb.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(long_app_name)
+endif
 
 rpm: build
+ifeq ($(findstring linux,$(target)),linux)
        @$(eval filename := $(app_name)-$(target)-$(channel))
-       cargo generate-rpm --profile $(profile) --target $(target)
+       @export $$(cat .env | xargs) > /dev/null 2>&1 && cargo generate-rpm --profile $(profile) --target $(target)
        mv target/$(target)/generate-rpm/*.rpm $(filename).rpm
        sha256sum $(filename).rpm > $(filename).rpm.sha256
-       rsync -avz $(filename).rpm deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
-       rsync -avz $(filename).rpm.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+       rsync -avz $(filename).rpm deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(long_app_name)
+       rsync -avz $(filename).rpm.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(long_app_name)
+endif
 
 tar: build
        @$(eval filename := $(app_name)-$(target)-$(channel))
        tar -czvf $(filename).tar.gz -C target/$(target)/$(profile)/ $(app_name)
        sha256sum $(filename).tar.gz > $(filename).tar.gz.sha256
-       rsync -avz $(filename).tar.gz deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
-       rsync -avz $(filename).tar.gz.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(app_name)
+       rsync -avz $(filename).tar.gz deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(long_app_name)
+       rsync -avz $(filename).tar.gz.sha256 deploy@conchos.unlimited.pizza:/srv/http/build.r.bdr.sh/$(long_app_name)
 
 package: $(architectures)
 
+mac:
+       @$(eval mac_architectures := x86_64-apple-darwin aarch64-apple-darwin)
+ifeq ($(tag),)
+       $(MAKE) -e profile=release -e architectures='$(mac_architectures)' -e channel=unstable package
+else
+       $(MAKE) -e profile=release -e architectures='$(mac_architectures)' -e channel=$(tag) package
+endif
+
+
 ci:
 ifeq ($(GIT_REF),refs/heads/main)
        $(MAKE) -e profile=release -e channel=unstable package