From 24edf65fa2a117f9fd5f63ce8d1b8d65bc85ac88 Mon Sep 17 00:00:00 2001 From: fritzkink <96341974+fritzkink@users.noreply.github.com> Date: Sun, 25 Feb 2024 17:10:33 +0100 Subject: [PATCH] rust - reworked build instructions --- components/developer/rust/Makefile | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/components/developer/rust/Makefile b/components/developer/rust/Makefile index af0609a..c5dc412 100644 --- a/components/developer/rust/Makefile +++ b/components/developer/rust/Makefile @@ -32,12 +32,11 @@ # the compiler build itself is intensively using python tools # therefor this patially python settings -TEST_STYLE= none - include ../../../make-rules/shared-macros.mk COMPONENT_NAME= rustc COMPONENT_VERSION= 1.76.0 +COMPONENT_REVISION= 1 COMPONENT_SUMMARY= Rust - Safe, concurrent, practical language COMPONENT_PROJECT_URL= https://www.rust-lang.org COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)-src @@ -55,7 +54,6 @@ TEST_TARGET= $(NO_TESTS) include $(WS_MAKE_RULES)/common.mk -include $(WS_MAKE_RULES)/setup.py.mk CLANG_VERSION= 17 @@ -114,16 +112,11 @@ CONFIGURE_OPTIONS += --llvm-root=$(CLANG_PREFIX) CONFIGURE_OPTIONS += --llvm-config=$(CLANG_PREFIX)/bin -COMPONENT_BUILD_CMD = $(PYTHON) x.py build -COMPONENT_INSTALL_CMD = $(PYTHON) x.py install -COMPONENT_INSTALL_ARGS = - # Cleanup standard environment! COMPONENT_BUILD_ENV = COMPONENT_BUILD_ENV += OPENSSL_DIR=$(OPENSSL_PREFIX) COMPONENT_BUILD_ENV += OPENSSL_LIB_DIR=$(OPENSSL_LIBDIR) COMPONENT_BUILD_ENV += OPENSSL_INCLUDE_DIR=$(OPENSSL_INCDIR) -COMPONENT_BUILD_ENV += OPENSSL_STATIC=0 COMPONENT_BUILD_ENV += CC=$(CC) COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)" COMPONENT_BUILD_ENV += CXX=$(CXX) @@ -131,10 +124,9 @@ COMPONENT_BUILD_ENV += AR=$(GNUAR) COMPONENT_BUILD_ENV += RUSTC=/usr/bin/rustc COMPONENT_BUILD_ENV += CARGO_HOME=$(CARGO_HOME) -COMPONENT_BUILD_ENV += GMAKE= -# Enforce linker consistency -COMPONENT_BUILD_ENV += RUSTFLAGS="-C linker=$(CC)" -COMPONENT_BUILD_ENV += RUST_BACKTRACE=1 +COMPONENT_BUILD_ENV += PATH=$(PATH) +COMPONENT_BUILD_ENV += VERBOSE=1 +COMPONENT_BUILD_ENV += RUST_BACKTRACE=1 COMPONENT_PRE_INSTALL_ACTION = mkdir -p $(PROTO_DIR) COMPONENT_POST_INSTALL_ACTION += $(TOUCH) $(BUILD_DIR)/META.depend-runtime.res -- Gitblit v1.9.3