File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -42,11 +42,12 @@ PROG_PREFIX ?=
4242
4343# This won't support any directory with spaces in its name, but you can just
4444# make a symlink without spaces that points to the directory.
45+ # CARGO_BUILD_TARGET should be undefined for not cross-build.
4546BASEDIR ?= $(shell pwd)
4647ifdef CARGO_TARGET_DIR
4748BUILDDIR := $(CARGO_TARGET_DIR ) /${PROFILE}
4849else
49- BUILDDIR := $(BASEDIR ) /target/${PROFILE}
50+ BUILDDIR := $(BASEDIR ) /target/$( CARGO_BUILD_TARGET ) /$ {PROFILE}
5051endif
5152PKG_BUILDDIR := $(BUILDDIR ) /deps
5253DOCSDIR := $(BASEDIR ) /docs
@@ -400,7 +401,7 @@ distclean: clean
400401ifeq ($(MANPAGES ) ,y)
401402# Do not cross-build uudoc
402403build-uudoc :
403- @unset CARGO_BUILD_TARGET && ${CARGO} build ${CARGOFLAGS} --bin uudoc --features " uudoc ${EXES} " ${PROFILE_CMD} --no-default-features
404+ ${CARGO} build ${CARGOFLAGS} --bin uudoc --features " uudoc ${EXES} " ${PROFILE_CMD} --no-default-features
404405
405406install-manpages : build-uudoc
406407 mkdir -p $(DESTDIR )$(DATAROOTDIR ) /man/man1
You can’t perform that action at this time.
0 commit comments