Skip to content

Commit 1a20765

Browse files
committed
DRY up CARGO_VERBOSE for JITs
1 parent 1165096 commit 1a20765

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

defs/jit.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
RUST_LIB_TOUCH = touch $@
88

99
ifneq ($(JIT_CARGO_SUPPORT),no)
10+
11+
# Show Cargo progress when doing `make V=1`
12+
CARGO_VERBOSE_0 = -q
13+
CARGO_VERBOSE_1 =
14+
CARGO_VERBOSE = $(CARGO_VERBOSE_$(V))
15+
1016
# NOTE: MACOSX_DEPLOYMENT_TARGET to match `rustc --print deployment-target` to avoid the warning below.
1117
# ld: warning: object file (target/debug/libjit.a(<libcapstone object>)) was built for
1218
# newer macOS version (15.2) than being linked (15.0)

yjit/yjit.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# -*- mode: makefile-gmake; indent-tabs-mode: t -*-
22

3-
# Show Cargo progress when doing `make V=1`
4-
CARGO_VERBOSE_0 = -q
5-
CARGO_VERBOSE_1 =
6-
CARGO_VERBOSE = $(CARGO_VERBOSE_$(V))
7-
83
YJIT_SRC_FILES = $(wildcard \
94
$(top_srcdir)/yjit/Cargo.* \
105
$(top_srcdir)/yjit/src/*.rs \

zjit/zjit.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
# Put no definitions when ZJIT isn't configured
44
ifneq ($(ZJIT_SUPPORT),no)
55

6-
# Show Cargo progress when doing `make V=1`
7-
CARGO_VERBOSE_0 = -q
8-
CARGO_VERBOSE_1 =
9-
CARGO_VERBOSE = $(CARGO_VERBOSE_$(V))
10-
116
ZJIT_SRC_FILES = $(wildcard \
127
$(top_srcdir)/zjit/Cargo.* \
138
$(top_srcdir)/zjit/src/*.rs \

0 commit comments

Comments
 (0)