Skip to content

Commit 9dcbccb

Browse files
committed
set CMAKE_INSTALL_LIBDIR to lib
Signed-off-by: Peter Rong <[email protected]>
1 parent 74d5016 commit 9dcbccb

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

buildbot/build_tflite.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,8 @@ git clone --filter=tree:0 --no-checkout ${GEMMLOWP_REPOSITORY} gemmlowp/src/gemm
120120
git -C gemmlowp/src/gemmlowp checkout ${GEMMLOWP_TAG}
121121
cmake -GNinja -S gemmlowp/src/gemmlowp/contrib -B gemmlowp/src/gemmlowp-build \
122122
-DCMAKE_INSTALL_PREFIX:PATH=${PWD}/gemmlowp \
123-
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
124-
ninja -C gemmlowp/src/gemmlowp-build install
125-
# Sometimes INSTALL_LIBDIR defaults to `lib64` instead of `lib`
126-
# Ask CMakeCache which one did it use.
127-
export gemmlowp_INSTALL_LIBDIR=$(grep CMAKE_INSTALL_LIBDIR\:PATH= gemmlowp/src/gemmlowp-build/CMakeCache.txt | cut -d'=' -f2-)
123+
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
124+
-DCMAKE_INSTALL_LIBDIR=lib
128125

129126
# ml_dtypes
130127
git clone --filter=tree:0 --no-checkout ${ML_DTYPES_REPOSITORY} ml_dtypes/src/ml_dtypes
@@ -144,7 +141,7 @@ cmake -GNinja -S tensorflow/src/tensorflow/tensorflow/lite -B tensorflow/src/ten
144141
-Druy_DIR:PATH=${PWD}/ruy/lib/cmake/ruy \
145142
-Dabsl_DIR:PATH=${PWD}/abseil-cpp/lib/cmake/absl \
146143
-DEigen3_DIR:PATH=${PWD}/eigen/share/eigen3/cmake \
147-
-Dgemmlowp_DIR:PATH=${PWD}/gemmlowp/${gemmlowp_INSTALL_LIBDIR}/cmake/gemmlowp \
144+
-Dgemmlowp_DIR:PATH=${PWD}/gemmlowp/lib/cmake/gemmlowp \
148145
-DNEON_2_SSE_DIR:PATH=${PWD}/ARM_NEON_2_x86_SSE/lib/cmake/NEON_2_SSE \
149146
-DFlatBuffers_DIR:PATH=${PWD}/flatbuffers/lib/cmake/flatbuffers \
150147
-DML_DTYPES_SOURCE_DIR:PATH=${PWD}/ml_dtypes/src/ml_dtypes
@@ -157,7 +154,7 @@ set(ruy_DIR "${PWD}/ruy/lib/cmake/ruy" CACHE PATH "")
157154
set(absl_DIR "${PWD}/abseil-cpp/lib/cmake/absl" CACHE PATH "")
158155
set(Eigen3_DIR "${PWD}/eigen/share/eigen3/cmake" CACHE PATH "")
159156
set(NEON_2_SSE_DIR "${PWD}/ARM_NEON_2_x86_SSE/lib/cmake/NEON_2_SSE" CACHE PATH "")
160-
set(gemmlowp_DIR "${PWD}/gemmlowp/${gemmlowp_INSTALL_LIBDIR}/cmake/gemmlowp" CACHE PATH "")
157+
set(gemmlowp_DIR "${PWD}/gemmlowp/lib/cmake/gemmlowp" CACHE PATH "")
161158
set(FlatBuffers_DIR "${PWD}/flatbuffers/lib/cmake/flatbuffers" CACHE PATH "")
162159
set(tensorflow-lite_DIR "${PWD}/tensorflow/lib/cmake/tensorflow-lite" CACHE PATH "")
163160
set(TENSORFLOW_SRC_DIR "${PWD}/tensorflow/src/tensorflow" CACHE PATH "")

0 commit comments

Comments
 (0)