From 8861c392ef94124d602d55b046af331d9b5d5d5f Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 30 Nov 2015 18:39:57 +1100 Subject: [PATCH] Makefile: fix nonetwork location and `make -t` --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 03b42b84..ef2ca963 100644 --- a/Makefile +++ b/Makefile @@ -418,13 +418,15 @@ $(foreach PKG,$(PKGS),$(eval $(call PKG_RULE,$(PKG)))) # disable networking during build-only rules for reproducibility ifeq ($(findstring darwin,$(BUILD)),) - NONET_LIB := $(PREFIX)/lib/nonetwork.so + NONET_LIB := $(PREFIX)/$(BUILD)/lib/nonetwork.so PRELOAD := LD_PRELOAD='$(NONET_LIB)' else - NONET_LIB := $(PREFIX)/lib/nonetwork.dylib + NONET_LIB := $(PREFIX)/$(BUILD)/lib/nonetwork.dylib PRELOAD := DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES='$(NONET_LIB)' endif +$(shell [ -d '$(PREFIX)/$(BUILD)/lib' ] || mkdir -p '$(PREFIX)/$(BUILD)/lib') + $(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c @mkdir -p $(dir $@) @$(BUILD_CC) -shared -fPIC -o $@ $<