Skip to content

Commit 5955715

Browse files
committed
Fix config script.
1 parent 9c7fbcb commit 5955715

1 file changed

Lines changed: 9 additions & 13 deletions

File tree

certifiable-build/scripts/config.sh

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,16 @@ PREFIX=${PREFIX:-/usr/local}
3535
clang_dir="${CONFIGS_ROOT}/${PROJECT}-clang"
3636
gcc_dir="${CONFIGS_ROOT}/${PROJECT}-gcc"
3737

38-
mkdir -p "$clang_dir" "$gcc_dir"
38+
mkdir -p "$CONFIGS_ROOT"
3939

40-
"$BDEP" config list @clang >/dev/null 2>&1 || \
41-
"$BDEP" init -C "$clang_dir" @clang cc config.c=clang
40+
"$BDEP" deinit --force -a @gcc @clang >/dev/null 2>&1 || true
41+
"$BDEP" config remove @gcc @clang >/dev/null 2>&1 || true
4242

43-
"$BDEP" config list @gcc >/dev/null 2>&1 || \
44-
"$BDEP" init -C "$gcc_dir" @gcc cc config.c=gcc
45-
46-
"$BDEP" init @clang @gcc
47-
48-
"$BDEP" config set @clang \
43+
"$BDEP" init --wipe -C "$gcc_dir" @gcc \
44+
cc config.cc=gcc \
4945
"config.config.mode=$BUILD_TYPE" \
50-
"config.install.root=$PREFIX" >/dev/null 2>&1 || true
46+
"config.install.root=$PREFIX"
5147

52-
"$BDEP" config set @gcc \
53-
"config.config.mode=$BUILD_TYPE" \
54-
"config.install.root=$PREFIX" >/dev/null 2>&1 || true
48+
"$BDEP" init --wipe -C "$clang_dir" @clang \
49+
cc config.cc=clang \
50+
"config.config.mode=$BUILD_TYPE"

0 commit comments

Comments
 (0)