Skip to content

Commit d2d80e7

Browse files
xiaoxiang781216btashton
authored andcommitted
cibuild.sh: Remove the flock installation
follow up the apps repo change: commit 18137c0fec3cea30871f29238e11ea0f4e8523da Author: Matias N <[email protected]> Date: Sat Sep 12 00:36:23 2020 -0300 Fix: ensure archive files do not carry object files from prior builds This is the corresponding change to the one on main NuttX repo. In this case this involves splitting the build of libapps.a into: a) building all applications (which is safely parallelizable), b) adding each application's object files to the archive in turns (serial by nature). This removes the need for the flock used to protect the parallel build. Signed-off-by: Xiang Xiao <[email protected]>
1 parent 732c33b commit d2d80e7

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

cibuild.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ EXTRA_PATH=
3737

3838
case $os in
3939
Darwin)
40-
install="python-tools u-boot-tools discoteq-flock elf-toolchain gen-romfs kconfig-frontends arm-gcc-toolchain riscv-gcc-toolchain xtensa-esp32-gcc-toolchain avr-gcc-toolchain c-cache binutils"
40+
install="python-tools u-boot-tools elf-toolchain gen-romfs kconfig-frontends arm-gcc-toolchain riscv-gcc-toolchain xtensa-esp32-gcc-toolchain avr-gcc-toolchain c-cache binutils"
4141
mkdir -p ${prebuilt}/homebrew
4242
export HOMEBREW_CACHE=${prebuilt}/homebrew
4343
;;
@@ -70,17 +70,6 @@ function u-boot-tools {
7070
fi
7171
}
7272

73-
function discoteq-flock {
74-
if ! type flock > /dev/null; then
75-
case $os in
76-
Darwin)
77-
brew tap discoteq/discoteq
78-
brew install flock
79-
;;
80-
esac
81-
fi
82-
}
83-
8473
function elf-toolchain {
8574
if ! type x86_64-elf-gcc > /dev/null; then
8675
case $os in

0 commit comments

Comments
 (0)