Tup: reduce output path variables
This commit is contained in:
parent
65d7eff10f
commit
790b82a88d
16
Tuprules.tup
16
Tuprules.tup
|
@ -1,7 +1,6 @@
|
||||||
.gitignore
|
.gitignore
|
||||||
|
|
||||||
OUTPUTS_OUT=$(TUP_CWD)/out
|
OUT_DIR=$(TUP_CWD)/out
|
||||||
OUTPUTS_DEV=$(TUP_CWD)/dev
|
|
||||||
DEV_DIR = $(TUP_CWD)/dev
|
DEV_DIR = $(TUP_CWD)/dev
|
||||||
|
|
||||||
ifeq (@(TUP_ARCH),i386)
|
ifeq (@(TUP_ARCH),i386)
|
||||||
|
@ -22,7 +21,7 @@ ifeq (@(TUP_ARCH),arm_v8)
|
||||||
CC_MARCH = -march=armv8-a
|
CC_MARCH = -march=armv8-a
|
||||||
endif
|
endif
|
||||||
|
|
||||||
OUT_BIN_DIR = $(OUTPUTS_OUT)/bin
|
OUT_BIN_DIR = $(OUT_DIR)/bin
|
||||||
|
|
||||||
GENODE_DIR = $(TUP_CWD)
|
GENODE_DIR = $(TUP_CWD)
|
||||||
|
|
||||||
|
@ -52,9 +51,6 @@ endif
|
||||||
|
|
||||||
BIN_VERSION=$(DEPOT_VERSION)
|
BIN_VERSION=$(DEPOT_VERSION)
|
||||||
|
|
||||||
BIN_DIR = $(OUT_BIN_DIR)/$(BIN_NAME)/$(DEPOT_VERSION)
|
|
||||||
# Destination for locally defined binary package
|
|
||||||
|
|
||||||
!bin = |> |>
|
!bin = |> |>
|
||||||
# Macro invoked in BIN_RULES
|
# Macro invoked in BIN_RULES
|
||||||
|
|
||||||
|
@ -63,7 +59,7 @@ BIN_DIR = $(OUT_BIN_DIR)/$(BIN_NAME)/$(DEPOT_VERSION)
|
||||||
|
|
||||||
!collect_bin = |> ^ COLLECT %b^ \
|
!collect_bin = |> ^ COLLECT %b^ \
|
||||||
$STRIP -o %o %f \
|
$STRIP -o %o %f \
|
||||||
|> $(OUT_BIN_DIR)/$(BIN_NAME)/%b $(OUTPUTS_OUT)/<bin>
|
|> $(OUT_BIN_DIR)/$(BIN_NAME)/%b $(OUT_DIR)/<bin>
|
||||||
|
|
||||||
!collect_static = |> ^ COLLECT %b^ \
|
!collect_static = |> ^ COLLECT %b^ \
|
||||||
cp %f %o \
|
cp %f %o \
|
||||||
|
@ -87,10 +83,10 @@ NIX_BUILD = nix-build --option substitute no
|
||||||
|
|
||||||
LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name`
|
LIBGCC = `$(CC) $(CC_MARCH) -print-libgcc-file-name`
|
||||||
|
|
||||||
LIB_DIR = $(OUTPUTS_DEV)/lib
|
LIB_DIR = $(DEV_DIR)/lib
|
||||||
|
|
||||||
export PKG_CONFIG_PATH
|
export PKG_CONFIG_PATH
|
||||||
PKG_CONFIG_DIR = $(OUTPUTS_DEV)/lib/pkgconfig
|
PKG_CONFIG_DIR = $(DEV_DIR)/lib/pkgconfig
|
||||||
PKG_CONFIG = PKG_CONFIG_PATH=$(PKG_CONFIG_DIR):$PKG_CONFIG_PATH pkg-config
|
PKG_CONFIG = PKG_CONFIG_PATH=$(PKG_CONFIG_DIR):$PKG_CONFIG_PATH pkg-config
|
||||||
|
|
||||||
DEFINES += -g
|
DEFINES += -g
|
||||||
|
@ -140,7 +136,7 @@ endif
|
||||||
-T &(LD_SCRIPT_SO) \
|
-T &(LD_SCRIPT_SO) \
|
||||||
tmp.o; \
|
tmp.o; \
|
||||||
rm tmp.o; \
|
rm tmp.o; \
|
||||||
|> $(OUTPUTS_DEV)/lib/%B.lib.so $(GENODE_DIR)/<lib>
|
|> $(DEV_DIR)/lib/%B.lib.so $(GENODE_DIR)/<lib>
|
||||||
|
|
||||||
!dhall = |> ^b dhall > %o^ dhall |>
|
!dhall = |> ^b dhall > %o^ dhall |>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue