Skip to content

Commit d4901f9

Browse files
authored
Build install
1 parent 48227b7 commit d4901f9

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

util/build-gnu.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,13 @@ fi
131131
cd -
132132

133133
# Pass the feature flags to make, which will pass them to cargo
134-
"${MAKE}" MULTICALL=y PROFILE="${UU_MAKE_PROFILE}" CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
134+
# The GNU tests rename install to ginstall to avoid confusion with the make target
135+
"${MAKE}" UTILS=install PROG_PREFIX=g PROFILE="${UU_MAKE_PROFILE}" CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
136+
"${MAKE}" SKIP_UTILS=install MULTICALL=y PROFILE="${UU_MAKE_PROFILE}" CARGOFLAGS="${CARGO_FEATURE_FLAGS}"
135137
# copy binaries
136138
for binary in $(${UU_BUILD_DIR}/coreutils --list); do
137139
(cd ${UU_BUILD_DIR} && cp -v --remove-destination coreutils "$binary")
138140
done
139-
echo -e '#!/bin/sh\nexec $(dirname $0)/install "$@"' > "${UU_BUILD_DIR}/ginstall" && chmod +x "${UU_BUILD_DIR}/ginstall" # The GNU tests rename this script before running, to avoid confusion with the make target
140141
touch g
141142
echo "stat with selinux support"
142143
${UU_BUILD_DIR}/stat -c%C g || true

0 commit comments

Comments
 (0)