fix: Fix the libbacktrace cfg for nicer backtraces (#4)

alumina-lang · Oct 13, 2024 · 347daea · 347daea
1 parent 1fc7262
commit 347daea
Show file tree

Hide file tree

Showing 4 changed files with 1,686 additions and 1,795 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -30,8 +30,8 @@ WORKDIR /build/libbacktrace
 RUN git clone https://github.com/ianlancetaylor/libbacktrace.git .
 RUN ./configure && make -j8
 WORKDIR /build/minicoro
-RUN curl -Ss -o minicoro.h https://raw.githubusercontent.com/edubart/minicoro/main/minicoro.h
-RUN gcc -O0 -g3 -fPIE -rdynamic -DMINICORO_IMPL -xc -c -o minicoro.o minicoro.h && \
+RUN curl -Ss -o minicoro.c https://raw.githubusercontent.com/edubart/minicoro/main/minicoro.h
+RUN gcc -O0 -g3 -fPIE -rdynamic -DMINICORO_IMPL -DNDEBUG -c -o minicoro.o minicoro.c && \
     ar rcs libminicoro.a minicoro.o
 
 FROM ubuntu:24.04 as combined
@@ -70,7 +70,7 @@ RUN /usr/bin/alumina-boot \
     --sysroot /usr/include/alumina \
     --debug \
     --cfg threading \
-    --cfg use_libbacktrace \
+    --cfg libbacktrace \
     --cfg coroutines \
     -Zast-only \
     -Zdump-ast=/usr/include/alumina/sysroot.ast
@@ -80,7 +80,7 @@ RUN /usr/bin/alumina-boot \
     --debug \
     --cfg test \
     --cfg threading \
-    --cfg use_libbacktrace \
+    --cfg libbacktrace \
     --cfg coroutines \
     -Zast-only \
     -Zdump-ast=/usr/include/alumina/sysroot-test.ast

diff --git a/package.json b/package.json
@@ -19,8 +19,8 @@
     "@mui/material": "^6.0.2",
     "adm-zip": "^0.5.16",
     "ansi-to-html": "^0.7.2",
-    "monaco-editor": "^0.51.0",
-    "next": "14.2.8",
+    "monaco-editor": "^0.52.0",
+    "next": "14.2.15",
     "next-pwa": "^5.6.0",
     "notistack": "^3.0.1",
     "react": "18.3.1",
@@ -30,12 +30,12 @@
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.3",
-    "@types/node": "22.5.4",
-    "@types/react": "18.3.5",
+    "@types/node": "22.7.5",
+    "@types/react": "18.3.11",
     "@types/temp": "^0.9.3",
     "@types/tmp": "^0.2.5",
-    "eslint": "9.9.1",
-    "eslint-config-next": "14.2.8",
-    "typescript": "5.5.4"
+    "eslint": "9.12.0",
+    "eslint-config-next": "14.2.15",
+    "typescript": "5.6.3"
   }
 }
diff --git a/scripts/run.sh b/scripts/run.sh
@@ -44,13 +44,13 @@ touch compiler.output
 
 if [[ -v TEST ]]; then
     minimum_security_prison $ALUMINA_BOOT \
-        $alumina_extra_args --debug --cfg threading --cfg use_libbacktrace --cfg coroutines --cfg test \
+        $alumina_extra_args --debug --cfg threading --cfg libbacktrace --cfg coroutines --cfg test \
         playground=program.alu \
         -o program.c &>> compiler.output
     extra_env="-E CLICOLOR_FORCE=1"
 else
     minimum_security_prison $ALUMINA_BOOT \
-        $alumina_extra_args --debug --cfg threading --cfg use_libbacktrace --cfg coroutines \
+        $alumina_extra_args --debug --cfg threading --cfg libbacktrace --cfg coroutines \
         playground=program.alu \
         -o program.c &>> compiler.output
     extra_env=""