Skip to content

Commit d2e1362

Browse files
authored
Merge pull request #3173 from eder-matheus/fix_docker
force symlink overwrite if it already exists
2 parents 926e4d8 + 334359f commit d2e1362

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docker/Dockerfile.builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN mkdir -p /usr/local/bin/wrapped-cc && \
2020
echo '#!/bin/sh' > /usr/local/bin/wrapped-cc/gcc && \
2121
echo 'exec /usr/bin/gcc -D__TIME__="\"0\"" -D__DATE__="\"0\"" -D__TIMESTAMP__="\"0\"" -Wno-builtin-macro-redefined "$@"' >> /usr/local/bin/wrapped-cc/gcc && \
2222
chmod +x /usr/local/bin/wrapped-cc/gcc && \
23-
ln -s /usr/local/bin/wrapped-cc/gcc /usr/local/bin/wrapped-cc/cc && \
23+
ln -sf /usr/local/bin/wrapped-cc/gcc /usr/local/bin/wrapped-cc/cc && \
2424
echo '#!/bin/sh' > /usr/local/bin/wrapped-cc/g++ && \
2525
echo 'exec /usr/bin/g++ -D__TIME__="\"0\"" -D__DATE__="\"0\"" -D__TIMESTAMP__="\"0\"" -Wno-builtin-macro-redefined "$@"' >> /usr/local/bin/wrapped-cc/g++ && \
2626
chmod +x /usr/local/bin/wrapped-cc/g++

docker/Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN mkdir -p /usr/local/bin/wrapped-cc && \
2121
echo '#!/bin/sh' > /usr/local/bin/wrapped-cc/gcc && \
2222
echo 'exec /usr/bin/gcc -D__TIME__="\"0\"" -D__DATE__="\"0\"" -D__TIMESTAMP__="\"0\"" -Wno-builtin-macro-redefined "$@"' >> /usr/local/bin/wrapped-cc/gcc && \
2323
chmod +x /usr/local/bin/wrapped-cc/gcc && \
24-
ln -s /usr/local/bin/wrapped-cc/gcc /usr/local/bin/wrapped-cc/cc && \
24+
ln -sf /usr/local/bin/wrapped-cc/gcc /usr/local/bin/wrapped-cc/cc && \
2525
echo '#!/bin/sh' > /usr/local/bin/wrapped-cc/g++ && \
2626
echo 'exec /usr/bin/g++ -D__TIME__="\"0\"" -D__DATE__="\"0\"" -D__TIMESTAMP__="\"0\"" -Wno-builtin-macro-redefined "$@"' >> /usr/local/bin/wrapped-cc/g++ && \
2727
chmod +x /usr/local/bin/wrapped-cc/g++

0 commit comments

Comments
 (0)