Skip to content

Commit 335e1dc

Browse files
committed
Force external gcc to be ~strip to trigger a rebuild
1 parent 8ed4102 commit 335e1dc

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ ENV PATH="${PATH}:/spack/bin"
1313

1414
COPY spack.yaml /root/spack-env/spack.yaml
1515

16+
RUN spack compiler find
17+
18+
RUN sed -i '/^spec: gcc/s/$/ ~strip/' /root/.spack/packages.yaml
19+
1620
RUN spack -e /root/spack-env concretize
1721
RUN spack -e /root/spack-env fetch -D
1822
RUN spack -e /root/spack-env install --fail-fast
@@ -31,10 +35,10 @@ ENV PATH="/bootstrap-view/bin:/spack/bin:${PATH}"
3135

3236
COPY spack.yaml /root/spack-env/spack.yaml
3337

34-
RUN sed -i 's/+binutils/+binutils +strip/g' /root/spack-env/spack.yaml
35-
3638
RUN spack compiler find /bootstrap-view/bin
3739

40+
RUN sed -i '/^spec: gcc/s/$/ ~strip/' /root/.spack/packages.yaml
41+
3842
RUN spack -e /root/spack-env concretize -Uf
3943
RUN spack -e /root/spack-env install --fail-fast
4044
RUN spack clean -a

spack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
spack:
66
specs:
77
- coreutils
8-
- gcc@14 +binutils build_type=MinSizeRel
8+
- gcc@14 +binutils +strip build_type=MinSizeRel
99
- git
1010
- gmake
1111
- patch

0 commit comments

Comments
 (0)