From ab08e623ef49018770260c299e9fa41c3ab4520c Mon Sep 17 00:00:00 2001 From: Arcterus Date: Mon, 30 Jun 2014 17:28:02 -0700 Subject: [PATCH 1/2] id: fix build --- id/id.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/id.rs b/id/id.rs index 8e9d33176..1eaa06f39 100644 --- a/id/id.rs +++ b/id/id.rs @@ -307,8 +307,8 @@ fn auditid() { } #[cfg(not(target_os = "linux"))] fn auditid() { - let auditinfo: audit::c_auditinfo_addr_t = unsafe { audit::uninitialized() }; - let address = &auditinfo as *mut audit::c_auditinfo_addr_t; + let mut auditinfo: audit::c_auditinfo_addr_t = unsafe { audit::uninitialized() }; + let address = &mut auditinfo as *mut audit::c_auditinfo_addr_t; if unsafe { audit::getaudit(address) } < 0 { println!("couldn't retrieve information"); return; From 141e85840702567c5f8d215e723dfd55dd7423a1 Mon Sep 17 00:00:00 2001 From: Arcterus Date: Mon, 30 Jun 2014 17:41:15 -0700 Subject: [PATCH 2/2] Modify Makefile to build correctly when using BUILD --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index a5186626b..40b4e83f8 100644 --- a/Makefile +++ b/Makefile @@ -130,9 +130,13 @@ endef ALIAS_SOURCE = $(firstword $(subst :, ,$(1))) ALIAS_TARGET = $(word 2,$(subst :, ,$(1))) define MAKE_ALIAS + +ifneq ($(ALIAS_TARGET,$(1)),) all: build/$(call ALIAS_TARGET,$(1)) build/$(call ALIAS_TARGET,$(1)): build/$(call ALIAS_SOURCE,$(1)) $(call command,install build/$(call ALIAS_SOURCE,$(1)) build/$(call ALIAS_TARGET,$(1))) +endif + endef # Test exe built rules @@ -145,11 +149,15 @@ tmp/$(1)_test: $(1)/test.rs endef # Main rules +ifeq ($(BUILD), $(PROGS)) all: $(EXES_PATHS) build/uutils -include build/uutils.d build/uutils: uutils/uutils.rs $(addprefix build/, $(addsuffix .timestamp, $(CRATES))) $(RUSTC) $(RUSTCFLAGS) -L build/ --dep-info $@.d uutils/uutils.rs -o $@ +else +all: $(EXES_PATHS) +endif # Dependencies LIBCRYPTO = $(shell $(RUSTC) --crate-file-name --crate-type rlib deps/rust-crypto/src/rust-crypto/lib.rs)