File tree Expand file tree Collapse file tree 3 files changed +11
-11
lines changed Expand file tree Collapse file tree 3 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -9,6 +9,6 @@ export LC_ALL=C.UTF-8
99export CONTAINER_NAME=ci_native_nowallet
1010export HOST=x86_64-pc-linux-gnu
1111export PACKAGES=" python3-zmq"
12- export DEP_OPTS=" NO_WALLET=1 CC=gcc-14 CXX=g++-14 "
12+ export DEP_OPTS=" NO_WALLET=1 CC=gcc-15 CXX=g++-15 "
1313export GOAL=" install"
14- export BITCOIN_CONFIG=" --enable-reduce-exports --with-boost-process CC=gcc-14 CXX=g++-14 "
14+ export BITCOIN_CONFIG=" --enable-reduce-exports --with-boost-process CC=gcc-15 CXX=g++-15 "
Original file line number Diff line number Diff line change @@ -101,7 +101,7 @@ RUN set -ex; \
101101# Nix-supplied compilers won't search for distro-installed libraries without explicit
102102# specification and we can't run binaries built with those compilers without specifying
103103# where their runtime dependencies are
104- ENV LD_LIBRARY_PATH="/usr/local/lib64/gcc-14 :/usr/local/lib/gcc-14 :/usr/local/lib64/gcc-11:/usr/local/lib/gcc-11:${LD_LIBRARY_PATH}"
104+ ENV LD_LIBRARY_PATH="/usr/local/lib64/gcc-15 :/usr/local/lib/gcc-15 :/usr/local/lib64/gcc-11:/usr/local/lib/gcc-11:${LD_LIBRARY_PATH}"
105105ENV LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/lib/multiarch:/usr/lib"
106106
107107RUN \
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ pkgsUnstable.buildEnv {
1616 ignoreCollisions = true ;
1717 paths = [
1818 pkgsLegacy . gcc11
19- pkgsUnstable . gcc14
19+ pkgsUnstable . gcc15
2020 ] ;
2121
2222 postBuild = ''
@@ -62,9 +62,9 @@ pkgsUnstable.buildEnv {
6262 ln -sf "${ pkgsLegacy . gcc11 } /bin/$binary" "$out/bin/$binary-11"
6363 ln -sf "${ pkgsLegacy . gcc11 } /bin/$binary" "$out/bin/$target_triple-$binary-11"
6464 fi
65- if [ -e "${ pkgsUnstable . gcc14 } /bin/$binary" ]; then
66- ln -sf "${ pkgsUnstable . gcc14 } /bin/$binary" "$out/bin/$binary-14 "
67- ln -sf "${ pkgsUnstable . gcc14 } /bin/$binary" "$out/bin/$target_triple-$binary-14 "
65+ if [ -e "${ pkgsUnstable . gcc15 } /bin/$binary" ]; then
66+ ln -sf "${ pkgsUnstable . gcc15 } /bin/$binary" "$out/bin/$binary-15 "
67+ ln -sf "${ pkgsUnstable . gcc15 } /bin/$binary" "$out/bin/$target_triple-$binary-15 "
6868 fi
6969 rm -f "$out/bin/$binary"
7070 done
@@ -76,11 +76,11 @@ pkgsUnstable.buildEnv {
7676 if [ -e "${ pkgsLegacy . gcc11 . cc . lib } /lib64" ]; then
7777 ln -sf "${ pkgsLegacy . gcc11 . cc . lib } /lib64" "$out/lib64/gcc-11"
7878 fi
79- if [ -e "${ pkgsUnstable . gcc14 . cc . lib } /lib" ]; then
80- ln -sf "${ pkgsUnstable . gcc14 . cc . lib } /lib" "$out/lib/gcc-14 "
79+ if [ -e "${ pkgsUnstable . gcc15 . cc . lib } /lib" ]; then
80+ ln -sf "${ pkgsUnstable . gcc15 . cc . lib } /lib" "$out/lib/gcc-15 "
8181 fi
82- if [ -e "${ pkgsUnstable . gcc14 . cc . lib } /lib64" ]; then
83- ln -sf "${ pkgsUnstable . gcc14 . cc . lib } /lib64" "$out/lib64/gcc-14 "
82+ if [ -e "${ pkgsUnstable . gcc15 . cc . lib } /lib64" ]; then
83+ ln -sf "${ pkgsUnstable . gcc15 . cc . lib } /lib64" "$out/lib64/gcc-15 "
8484 fi
8585 '' ;
8686}
You can’t perform that action at this time.
0 commit comments