Skip to content

[docker] Fix build-image.sh script for OpenCilk 3.0 updates to tools/… #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neboat wants to merge 1 commit into
base: release
Choose a base branch
from
Open

[docker] Fix build-image.sh script for OpenCilk 3.0 updates to tools/… #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ rm -f cilktools.tar.gz
echo "Modifying scripts for use in Docker environment..."

# The build script does not build the lld target, which is part of the binary release.
sed -i 's/COMPONENTS=\"clang\"/COMPONENTS=\"clang;lld\"/g' opencilk/infrastructure/tools/build
sed -i 's/COMPONENTS=\"clang/COMPONENTS=\"clang;lld/g' opencilk/infrastructure/tools/build

# This turns off assertions in the compiler, shaving off > 600 MB in size from the binaries.
sed -i 's/OPENCILK_ASSERTIONS=On/OPENCILK_ASSERTIONS=Off/g' opencilk/infrastructure/tools/build
Expand All @@ -60,7 +60,7 @@ sed -i 's/OPENCILK_ASSERTIONS=On/OPENCILK_ASSERTIONS=Off/g' opencilk/infrastruct
sed -i 's/cmake -D/cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DLLVM_ENABLE_LLD=On -D/g' opencilk/infrastructure/tools/build

# This sets the install prefix to /usr/local.
sed -i 's/OPENCILK_INSTALL_PREFIX=\/opt\/opencilk-2/OPENCILK_INSTALL_PREFIX=\/usr\/local/g' opencilk/infrastructure/tools/build
sed -i 's/OPENCILK_INSTALL_PREFIX=\/opt\/opencilk-3/OPENCILK_INSTALL_PREFIX=\/usr\/local/g' opencilk/infrastructure/tools/build

# Tar the source. We want to copy in the tar ball to save space; if we copy it in
# uncompressed, docker will hold onto the uncompressed data even if we compress it
Expand Down