Add x86 while I figure out aarch64

[rbdr/lyricli] / Makefile

diff --git a/Makefile b/Makefile
index e2c1648d4ef77a21e333ea81ca19d3f1d5a9f524..07cc42f01d45e60f465f3d1e026eae602a7eba71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ 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
 architectures := x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
 app_name := lrc
 long_app_name := lyricli

+host_architecture := $(target)

 
 default: build
 
 
 default: build
 


@@ -13,6 +14,13 @@ prepare:
        rustup target add $(target)
 
 build: 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
        @export $$(cat .env | xargs) > /dev/null 2>&1 && cargo build --profile $(profile) --target $(target)
 
 release: rpm tar deb


@@ -55,19 +63,19 @@ tar: build
 package: $(architectures)
 
 mac:
 package: $(architectures)
 
 mac:

-override architectures := x86_64-apple-darwin aarch64-apple-darwin
+       @$(eval mac_architectures := x86_64-apple-darwin aarch64-apple-darwin)

 ifeq ($(tag),)
 ifeq ($(tag),)

-       $(MAKE) -e profile=release -e architectures='$(architectures)' -e channel=unstable package
+       $(MAKE) -e profile=release -e architectures='$(mac_architectures)' -e channel=unstable package

 else
 else

-       $(MAKE) -e profile=release -e architectures='$(architectures)' -e channel=$(tag) package
+       $(MAKE) -e profile=release -e architectures='$(mac_architectures)' -e channel=$(tag) package

 endif
 
 
 ci:
 ifeq ($(GIT_REF),refs/heads/main)
 endif
 
 
 ci:
 ifeq ($(GIT_REF),refs/heads/main)

-       $(MAKE) -e profile=release -e channel=unstable package
+       $(MAKE) -e profile=release -e channel=unstable $(target)

 else ifneq (,$(findstring refs/tags/,$(GIT_REF)))
 else ifneq (,$(findstring refs/tags/,$(GIT_REF)))

-       $(MAKE) -e profile=release -e channel=$(subst refs/tags/,,$(GIT_REF)) package
+       $(MAKE) -e profile=release -e channel=$(subst refs/tags/,,$(GIT_REF)) $(target)

 endif
 
 .PHONY: default build $(architectures) rpm package prepare set_rust ci release
 endif
 
 .PHONY: default build $(architectures) rpm package prepare set_rust ci release