Skip to content

Commit a1bd6ea

Browse files
committed
Fix macos build
Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
1 parent 9594f39 commit a1bd6ea

1 file changed

Lines changed: 9 additions & 10 deletions

File tree

mac_build/buildfmt.sh

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,16 @@ if [[ "${GCC_archs}" = *"x86_64"* ]]; then GCC_can_build_x86_64="yes"; fi
8383
if [[ "${GCC_archs}" = *"arm64"* ]]; then GCC_can_build_arm64="yes"; fi
8484

8585
if [ "${doclean}" != "yes" ]; then
86-
if [ -f "${libPath}/fmt.a" ]; then
86+
if [ -f "${libPath}/libfmt.a" ]; then
8787
alreadyBuilt=1
8888

8989
if [ $GCC_can_build_x86_64 = "yes" ]; then
90-
lipo "${libPath}/fmt.a" -verify_arch x86_64
90+
lipo "${libPath}/libfmt.a" -verify_arch x86_64
9191
if [ $? -ne 0 ]; then alreadyBuilt=0; doclean="yes"; fi
9292
fi
9393

9494
if [ $alreadyBuilt -eq 1 ] && [ $GCC_can_build_arm64 = "yes" ]; then
95-
lipo "${libPath}/fmt.a" -verify_arch arm64
95+
lipo "${libPath}/libfmt.a" -verify_arch arm64
9696
if [ $? -ne 0 ]; then alreadyBuilt=0; doclean="yes"; fi
9797
fi
9898

@@ -140,7 +140,7 @@ export PATH="${TOOLSPATH1}":"${TOOLSPATH2}":"${TOOLSPATH3}":/usr/local/bin:$PATH
140140
SDKPATH=`xcodebuild -version -sdk macosx Path`
141141

142142
if [ -d "${libPath}" ]; then
143-
rm -f "${libPath}/fmt.a"
143+
rm -f "${libPath}/libfmt.a"
144144
if [ $? -ne 0 ]; then return 1; fi
145145
fi
146146

@@ -195,8 +195,7 @@ if [ $GCC_can_build_arm64 = "yes" ]; then
195195
echo " ******"
196196
else
197197

198-
ls -l ./
199-
mv -f ./lib/fmt.a ./lib/fmt_x86_64.a
198+
mv -f ./libfmt.a ./libfmt_x86_64.a
200199

201200
# Build for arm64 architecture
202201
make clean 1>$stdout_target
@@ -207,16 +206,16 @@ if [ $GCC_can_build_arm64 = "yes" ]; then
207206
return 1
208207
fi
209208

210-
mv -f ./lib/fmt.a ./lib/fmt_arm64.a
209+
mv -f ./libfmt.a ./libfmt_arm64.a
211210

212211
# combine x86_64 and arm libraries
213-
lipo -create ./lib/fmt_x86_64.a ./lib/fmt_arm64.a -output "./lib/fmt.a"
212+
lipo -create ./libfmt_x86_64.a ./libfmt_arm64.a -output "./libfmt.a"
214213
if [ $? -ne 0 ]; then
215-
rm -f ./lib/fmt_x86_64.a ./lib/fmt_arm64.a
214+
rm -f ./libfmt_x86_64.a ./libfmt_arm64.a
216215
return 1
217216
fi
218217

219-
rm -f ./lib/fmt_x86_64.a ./lib/fmt_arm64.a
218+
rm -f ./libfmt_x86_64.a ./libfmt_arm64.a
220219
fi
221220
fi
222221

0 commit comments

Comments
 (0)