diff --git a/tidepool/src/packages/foundation/gcc/default.nix b/tidepool/src/packages/foundation/gcc/default.nix
index 4aaf6f7..9062075 100644
--- a/tidepool/src/packages/foundation/gcc/default.nix
+++ b/tidepool/src/packages/foundation/gcc/default.nix
@@ -208,25 +208,18 @@ in
 
                   configure = ''
                     # Configure
-                    # 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 CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
-                    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"
+                    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 CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
+                    export LIBRARY_PATH="${foundation.stage1-musl}/lib"
 
-										: ''${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 \
                       --prefix=$out \
                       --build=${config.platform.build.triple} \
                       --host=${config.platform.host.triple} \
                       --target=${config.platform.target.triple} \
+											--with-sysroot=${foundation.stage1-musl} \
+											--with-native-system-header-dir=/include \
                       --enable-languages=c,c++ \
                       --disable-bootstrap \
                       --disable-libsanitizer \