File tree Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Expand file tree Collapse file tree 1 file changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -113,12 +113,21 @@ elif [ "$(uname)" = "Darwin" ]; then
113
113
114
114
# # Install packages
115
115
brew update
116
+ <<< <<< < HEAD
116
117
brew install coreutils
117
118
brew install readline
118
119
brew install cmake
119
120
brew install ninja
120
121
brew install swig
121
122
brew install lcov
123
+ =======
124
+ brew install coreutils \
125
+ readline \
126
+ cmake \
127
+ ninja \
128
+ swig \
129
+ lcov && true
130
+ >>>>>>> f9ebac8 (execute the realpath command based on OS environment)
122
131
123
132
brew install llvm@14 && \
124
133
sudo ln -s " $( brew --prefix llvm@14) /bin/clang-format" /usr/local/bin/clang-format-14 && \
@@ -133,11 +142,6 @@ elif [ "$(uname)" = "Darwin" ]; then
133
142
brew install cmake --HEAD
134
143
}
135
144
136
- # # Install coreutils for realpath
137
- brew install coreutils
138
-
139
- brew install ninja
140
-
141
145
readonly CUR_DIR=" $( dirname " $( realpath " $0 " ) " ) "
142
146
else
143
147
echo " platform $( uname) is not fully supported"
You can’t perform that action at this time.
0 commit comments