auxolotl/labs
22
8
Fork 4
Code Issues 1 Pull requests 3 Actions Packages Projects Releases Wiki Activity

Compare commits

base: auxolotl:6d0463d37d046829264a65b7f40996cc76e99974
Branches Tags
auxolotl:main
auxolotl:feat/portable-submodules
auxolotl:feat/cross
auxolotl:feat/transient-deps
auxolotl:feat/x86-64_linux
..
compare: auxolotl:e21778c81bb11b9830a813e44d0656e6af30cd68
Branches Tags
auxolotl:feat/portable-submodules
auxolotl:main
auxolotl:feat/cross
auxolotl:feat/transient-deps
auxolotl:feat/x86-64_linux

No commits in common. "6d0463d37d046829264a65b7f40996cc76e99974" and "e21778c81bb11b9830a813e44d0656e6af30cd68" have entirely different histories.
6d0463d37d ... e21778c81b

2 changed files with 22 additions and 17 deletions
Show stats Expand all files Collapse all files

18
tidepool/flake.lock
View file

@ -8,11 +8,10 @@
}, },
"locked": { "locked": {
"dir": "foundation", "dir": "foundation",
"lastModified": 1724190751, "dirtyRev": "cadfaabc853d20f2bc20bad794fcbe520ea48f13-dirty",
"narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=", "dirtyShortRev": "cadfaab-dirty",
"ref": "master", "lastModified": 1723737980,
"rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f", "narHash": "sha256-wytg4odrfvFVYvTskWUficyi8VnaaEt54aIlKUn3SKw=",
"revCount": 84,
"type": "git", "type": "git",
"url": "file:../" "url": "file:../"
}, },
@ -25,11 +24,10 @@
"lib": { "lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1724190751, "dirtyRev": "cadfaabc853d20f2bc20bad794fcbe520ea48f13-dirty",
"narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=", "dirtyShortRev": "cadfaab-dirty",
"ref": "master", "lastModified": 1723737980,
"rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f", "narHash": "sha256-wytg4odrfvFVYvTskWUficyi8VnaaEt54aIlKUn3SKw=",
"revCount": 84,
"type": "git", "type": "git",
"url": "file:../" "url": "file:../"
}, },

21
tidepool/src/packages/foundation/gcc/default.nix
View file

@ -203,23 +203,30 @@ in
patch = '' patch = ''
# Patch # Patch
# force musl even if host triple is gnu # force musl even if host triple is gnu
sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host # sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host
''; '';
configure = '' configure = ''
# Configure # Configure
export CC="gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so" # export CC="gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
export CXX="g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so" # export CXX="g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so" # export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
export LIBRARY_PATH="${foundation.stage1-musl}/lib" export CC="gcc -Wl,-dynamic-linker"
export CXX="g++ -Wl,-dynamic-linker"
export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker"
# export LIBRARY_PATH="${foundation.stage1-musl}/lib"
export LIBRARY_PATH="$AUX_COMPILER_LIBRARY_PATH"
: ''${LD_LIBRARY_PATH:=}
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/gmp/lib:$NIX_BUILD_TOP/mpfr/lib:$NIX_BUILD_TOP/mpc/lib:$NIX_BUILD_TOP/isl/lib:$LD_LIBRARY_PATH"
# --with-sysroot=${foundation.stage1-musl} \
# --with-native-system-header-dir=/include \
bash ./configure \ bash ./configure \
--prefix=$out \ --prefix=$out \
--build=${config.platform.build.triple} \ --build=${config.platform.build.triple} \
--host=${config.platform.host.triple} \ --host=${config.platform.host.triple} \
--target=${config.platform.target.triple} \ --target=${config.platform.target.triple} \
--with-sysroot=${foundation.stage1-musl} \
--with-native-system-header-dir=/include \
--enable-languages=c,c++ \ --enable-languages=c,c++ \
--disable-bootstrap \ --disable-bootstrap \
--disable-libsanitizer \ --disable-libsanitizer \