Conversation
dancrossnyc
previously approved these changes
Mar 16, 2026
jclulow
reviewed
Mar 17, 2026
tools/helios-build/src/main.rs
Outdated
| env += "export PYTHON3_PKGVERS=-311\n"; | ||
| } | ||
| } | ||
| env += &format!("export PYTHON3_VERSION={}", relver.python3_version()); |
Collaborator
There was a problem hiding this comment.
Don't you still need the newlines in the format strings here?
Contributor
Author
There was a problem hiding this comment.
Yes I do, thanks. I diffed the env files on helios2 to check there were no differences but I forgot that gmake setup also generates them. Looks good on helios3 with the latest commit.
helios3% ./helios-build genenv
Mar 17 08:33:34.478 WARN file /build/helios/projects/illumos/illumos-quick.sh exists, with wrong contents, unlinking
Mar 17 08:33:34.478 INFO writing /build/helios/projects/illumos/illumos-quick.sh ...
Mar 17 08:33:34.479 INFO ok!
Mar 17 08:33:34.481 WARN file /build/helios/projects/illumos/illumos-quick-debug.sh exists, with wrong contents, unlinking
Mar 17 08:33:34.481 INFO writing /build/helios/projects/illumos/illumos-quick-debug.sh ...
Mar 17 08:33:34.481 INFO ok!
Mar 17 08:33:34.484 WARN file /build/helios/projects/illumos/illumos.sh exists, with wrong contents, unlinking
Mar 17 08:33:34.484 INFO writing /build/helios/projects/illumos/illumos.sh ...
Mar 17 08:33:34.484 INFO ok!
Mar 17 08:33:34.667 WARN file /build/helios/projects/illumos/illumos-release.sh exists, with wrong contents, unlinking
Mar 17 08:33:34.668 INFO writing /build/helios/projects/illumos/illumos-release.sh ...
Mar 17 08:33:34.668 INFO ok!
Mar 17 08:33:34.668 INFO ok
helios3% cat /build/helios/projects/illumos/illumos-quick.sh
export NIGHTLY_OPTIONS='-nCAprt'
export CODEMGR_WS='/build/helios/projects/illumos'
export MACH="$(uname -p)"
export GNUC_ROOT=/opt/gcc-10
export PRIMARY_CC=gcc10,$GNUC_ROOT/bin/gcc,gnu
export PRIMARY_CCC=gcc10,$GNUC_ROOT/bin/g++,gnu
export SHADOW_CCS=
export SHADOW_CCCS=
export BUILDVERSION_EXEC="git describe --all --long --dirty"
export DMAKE_MAX_JOBS=64
export ENABLE_SMB_PRINTING='#'
export PERL_VERSION=5.40
export PERL_PKGVERS=
export PERL_VARIANT=-thread-multi
export BUILDPERL32='#'
export JAVA_ROOT=/usr/jdk/openjdk11.0
export JAVA_HOME=$JAVA_ROOT
export BLD_JAVA_11=
export BUILDPY2='#'
export BUILDPY3=
export BUILDPY2TOOLS='#'
export BUILDPY3TOOLS=
export PYTHON3_VERSION=3.13
export PYTHON3_PKGVERS=-313
export PYTHON3_SUFFIX=
export TOOLS_PYTHON=/usr/bin/python$PYTHON3_VERSION
export STAFFER="$LOGNAME"
export MAILTO="${MAILTO:-$STAFFER}"
export BUILD_PROJECT=''
export ATLOG="$CODEMGR_WS/log"
export LOGFILE="$ATLOG/nightly.log"
export BUILD_TOOLS='/opt'
export MAKEFLAGS='ke'
export PARENT_WS=''
export REF_PROTO_LIST="$PARENT_WS/usr/src/proto_list_${MACH}"
export PARENT_ROOT="$PARENT_WS/proto/root_$MACH"
export PARENT_TOOLS_ROOT="$PARENT_WS/usr/src/tools/proto/root_$MACH-nd"
export PKGARCHIVE="${CODEMGR_WS}/packages/${MACH}/nightly"
export VERSION="$(git describe --long --all HEAD | cut -d/ -f2-)"
export BOOTBANNER1="Oxide Helios Version ^v ^w-bit (onu)"
export ROOT="$CODEMGR_WS/proto/root_${MACH}"
export SRC="$CODEMGR_WS/usr/src"
export MULTI_PROTO="yes"
export ONBLD_BIN=/opt/onbld/bin
export ON_CLOSED_BINS=/opt/onbld/closed
export PKGVERS_BRANCH='3.0.999999'
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.