Add configure, configure Makevars.in -> Makevars (#165)

* Add configure, configure Makevars.in -> Makevars * Empty Makevars. * Different permissions for configure. * Implement suggestion by @yutannihilation
mlondschien · Jan 8, 2024 · f2159e9 · f2159e9
1 parent 6e8700d
commit f2159e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/changeforest-r/configure b/changeforest-r/configure
@@ -0,0 +1 @@
+sed -e "s|@RUST_TARGET@|$(rustc -vV | grep host | cut -d' ' -f2)|" src/Makevars.in > src/Makevars
diff --git a/changeforest-r/src/Makevars → changeforest-r/src/Makevars.in b/changeforest-r/src/Makevars → changeforest-r/src/Makevars.in
@@ -1,5 +1,6 @@
+TARGET ?= @RUST_TARGET@
 TARGET_DIR = ./rust/target
-LIBDIR = $(TARGET_DIR)/release
+LIBDIR = $(TARGET_DIR)/$(TARGET)/release
 STATLIB = $(LIBDIR)/libchangeforestr.a
 PKG_LIBS = -L$(LIBDIR) -lchangeforestr
 
@@ -17,7 +18,7 @@ $(STATLIB):
 		export CARGO_HOME=$(CARGOTMP); \
 	fi && \
 		export PATH="$(PATH):$(HOME)/.cargo/bin" && \
-		cargo build --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR)
+		cargo build --target=$(TARGET) --lib --release --manifest-path=./rust/Cargo.toml --target-dir $(TARGET_DIR)
 	if [ "$(NOT_CRAN)" != "true" ]; then \
 		rm -Rf $(CARGOTMP) && \
 		rm -Rf $(LIBDIR)/build; \