Skip to content

Commit 0158ab9

Browse files
authored
Merge pull request #12 from imotai/feat/add_absl
fix: move absl build to the end
2 parents 32d9f88 + 38d179b commit 0158ab9

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

build_env/build_library.sh

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -144,20 +144,7 @@ else
144144
echo "install gflags done"
145145
fi
146146

147-
if [ ! -f "absl_succ" ]; then
148-
echo "installing gtest ...."
149-
tar xzf a50ae369a30f99f79d7559002aba3413dac1bd48.tar.gz
150-
pushd abseil-cpp-a50ae369a30f99f79d7559002aba3413dac1bd48
151-
cmake -DCMAKE_INSTALL_PREFIX="$DEPS_PREFIX" -DCMAKE_CXX_FLAGS=-fPIC -DABSL_ENABLE_INSTALL=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DABSL_USE_GOOGLETEST_HEAD=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
152-
make "-j$(nproc)"
153-
make install
154-
ls -l ${DEPS_PREFIX}/lib64 | grep flags
155-
cp absl/flags/libabsl_flags_private_handle_accessor.a ${DEPS_PREFIX}/lib64/
156-
ls -l ${DEPS_PREFIX}/lib64 | grep flags
157-
popd
158-
touch absl_succ
159-
echo "install absl done"
160-
fi
147+
161148

162149
if [ -f "unwind_succ" ]; then
163150
echo "unwind_exist"
@@ -347,11 +334,19 @@ else
347334
echo "install boost done"
348335
fi
349336

350-
ls -l ${DEPS_PREFIX}/lib64 | grep flags
351-
352-
# Remove dynamic library files for static link
353337
find /depends/thirdparty/lib/ -name "lib*so*" | grep -v "libRemarks" | grep -v "libLTO" | xargs rm
354338
find /depends/thirdparty/lib64/ -name "lib*so*" | grep -v "libRemarks" | grep -v "libLTO" | xargs rm
355-
ls -l ${DEPS_PREFIX}/lib64 | grep flags
339+
340+
if [ ! -f "absl_succ" ]; then
341+
echo "installing gtest ...."
342+
tar xzf a50ae369a30f99f79d7559002aba3413dac1bd48.tar.gz
343+
pushd abseil-cpp-a50ae369a30f99f79d7559002aba3413dac1bd48
344+
cmake -DCMAKE_INSTALL_PREFIX="$DEPS_PREFIX" -DCMAKE_CXX_FLAGS=-fPIC -DABSL_ENABLE_INSTALL=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DABSL_USE_GOOGLETEST_HEAD=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON
345+
make "-j$(nproc)"
346+
make install
347+
popd
348+
touch absl_succ
349+
echo "install absl done"
350+
fi
356351

357352
popd

0 commit comments

Comments
 (0)