Browse Source

make: update makefile

Nick Peng 9 months ago
parent
commit
f522ce969d
1 changed files with 4 additions and 4 deletions
  1. 4 4
      plugin/smartdns-ui/Makefile

+ 4 - 4
plugin/smartdns-ui/Makefile

@@ -21,14 +21,14 @@ SLIBDIR := $(PREFIX)/lib
 DESTDIR :=
 SMARTDNS_SRC_DIR=../../src
 
-ARCH_TARGET:=$(shell $(CC) -dumpmachine | sed 's/-unknown-/-/')
+ARCH_TARGET:=$(shell $(CC) -dumpmachine | sed 's/-[^-]*-/-/')
 ARCH=$(shell echo $(ARCH_TARGET) | cut -d - -f 1)
 ABI=$(shell echo $(ARCH_TARGET) | cut -d - -f 3)
 ARCH_TARGET:=$(shell rustc --print target-list | grep $(ARCH) | grep linux | grep $(ABI) | head -n 1)
 ARCH_TARGET_PATH=$(ARCH_TARGET)/
 
 override CARGO_RUSTFLAGS=-C linker=$(CC)
-CARGO_BUILD_TYPE +=--target=$(ARCH_TARGET)
+CARGO_BUILD_ARGS +=--target=$(ARCH_TARGET)
 IS_MUSL=$(shell $(CC) -v 2>&1 | grep -i musl >/dev/null 2>&1 && echo 1 || echo 0)
 ifeq ($(IS_MUSL), 1)
 override CARGO_RUSTFLAGS +=-C target-feature=-crt-static
@@ -38,7 +38,7 @@ ifdef DEBUG
 CARGO_BUILD_PATH=target/$(ARCH_TARGET_PATH)debug
 SMARTDNS_BUILD_TYPE=DEBUG=1
 else
-CARGO_BUILD_TYPE +=--release
+CARGO_BUILD_ARGS +=--release
 CARGO_BUILD_PATH=target/$(ARCH_TARGET_PATH)release
 SMARTDNS_BUILD_TYPE=
 endif
@@ -51,7 +51,7 @@ test-prepare:
 	$(MAKE) -C $(SMARTDNS_SRC_DIR) libsmartdns-test.a
 
 $(BIN):
-	MAKEFLAGS= RUSTFLAGS="$(CARGO_RUSTFLAGS) $(RUSTFLAGS)" cargo build $(CARGO_BUILD_TYPE) --features "build-release"
+	MAKEFLAGS= RUSTFLAGS="$(CARGO_RUSTFLAGS) $(RUSTFLAGS)" cargo build $(CARGO_BUILD_ARGS) --features "build-release"
 	cp $(CARGO_BUILD_PATH)/libsmartdns_ui.so target/ 
 
 install: $(BIN)