Skip to content

Commit 472bffd

Browse files
authored
Merge pull request #4083 from The-OpenROAD-Project-staging/fix-4075
build: use deps prefixes
2 parents 1edaa82 + e8e66bd commit 472bffd

3 files changed

Lines changed: 22 additions & 2 deletions

File tree

build_openroad.sh

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,24 @@ __local_build()
265265

266266
if [ -z "${SKIP_OPENROAD+x}" ]; then
267267
echo "[INFO FLW-0018] Compiling OpenROAD."
268-
eval ${NICE} ./tools/OpenROAD/etc/Build.sh -dir="$DIR/tools/OpenROAD/build" -threads=${PROC} -cmake=\'${OPENROAD_APP_ARGS}\'
268+
if [ -f "${DIR}/openroad_deps_prefixes.txt" ]; then
269+
DEPS_PREFIX_ARG="${DIR}/openroad_deps_prefixes.txt"
270+
elif [ -f "${DIR}/tools/OpenROAD/etc/openroad_deps_prefixes.txt" ]; then
271+
DEPS_PREFIX_ARG="${DIR}/tools/OpenROAD/etc/openroad_deps_prefixes.txt"
272+
elif [ -f /etc/openroad_deps_prefixes.txt ]; then
273+
DEPS_PREFIX_ARG="/etc/openroad_deps_prefixes.txt"
274+
else
275+
DEPS_PREFIX_ARG=""
276+
fi
277+
if [[ -n "${DEPS_PREFIX_ARG}" ]]; then
278+
echo "[INFO FLW-0029] Found OpenROAD dependencies prefixes file: '${DEPS_PREFIX_ARG}'."
279+
DEPS_PREFIX_ARG="-deps-prefixes-file=${DEPS_PREFIX_ARG}"
280+
fi
281+
eval ${NICE} ./tools/OpenROAD/etc/Build.sh \
282+
-dir="$DIR/tools/OpenROAD/build" \
283+
-threads=${PROC} \
284+
-cmake=\'${OPENROAD_APP_ARGS}\' \
285+
${DEPS_PREFIX_ARG}
269286
${NICE} cmake --build tools/OpenROAD/build --target install -j "${PROC}"
270287
fi
271288

docker/Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN mkdir -p /usr/local/bin/wrapped-cc && \
2828

2929
ENV PATH="/usr/local/bin/wrapped-cc:$PATH"
3030

31-
RUN ./DependencyInstaller.sh -all $options $constantBuildDir \
31+
RUN ./DependencyInstaller.sh -all $options $constantBuildDir -save-deps-prefixes=/etc/openroad_deps_prefixes.txt \
3232
&& rm -rf /tmp/installer /tmp/* /var/tmp/* /var/lib/apt/lists/*
3333

3434
ARG fromImage

etc/DependencyInstaller.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,9 @@ while [ "$#" -gt 0 ]; do
370370
CI="yes"
371371
OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} -save-deps-prefixes=/etc/openroad_deps_prefixes.txt"
372372
;;
373+
-save-deps-prefixes=*)
374+
OR_INSTALLER_ARGS="${OR_INSTALLER_ARGS} $1"
375+
;;
373376
-yosys-ver=*)
374377
YOSYS_VER=${1#*=}
375378
;;

0 commit comments

Comments
 (0)