about summary refs log tree commit diff
diff options
context:
space:
mode:
authorantoyo <antoyo@users.noreply.github.com>2021-08-28 11:34:47 -0400
committerGitHub <noreply@github.com>2021-08-28 11:34:47 -0400
commit5dad13cc3bfbf69f470198860ea905d72fc9fbd3 (patch)
tree41ad2caeaaf747e5b4c4ee0c842e592b615b5a8b
parent6f50986667debbfc67776304a8ee23fe0158613f (diff)
downloadrust-5dad13cc3bfbf69f470198860ea905d72fc9fbd3.tar.gz
rust-5dad13cc3bfbf69f470198860ea905d72fc9fbd3.zip
Update custom rustc instructions (#73)
-rw-r--r--.github/workflows/main.yml5
-rw-r--r--.gitignore1
-rw-r--r--Readme.md3
-rw-r--r--gcc_path0
4 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 774a68aa5e1..98bed8ef387 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,7 +31,9 @@ jobs:
           ln gcc-build/libgccjit.so gcc-build/libgccjit.so.0
 
     - name: Set LIBRARY_PATH
-      run: echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
+      run: |
+        echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV
 
     # https://github.com/actions/cache/issues/133
     - name: Fixup owner of ~/.cargo/
@@ -66,6 +68,7 @@ jobs:
       run: |
         ./prepare_build.sh
         ./build.sh
+        cargo test
         ./clean_all.sh
 
     - name: Prepare dependencies
diff --git a/.gitignore b/.gitignore
index d9f0ae05ed4..573ed83e535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ gimple*
 *asm
 res
 test-backend
+gcc_path
diff --git a/Readme.md b/Readme.md
index 44cb1633474..96a6c3a0414 100644
--- a/Readme.md
+++ b/Readme.md
@@ -113,6 +113,5 @@ p loc->m_line
 
 ### How to use a custom-build rustc
 
- * Build the stage1 compiler (`rustup toolchain link debug-current stage2 build/x86_64-unknown-linux-gnu/stage1`).
+ * Build the stage2 compiler (`rustup toolchain link debug-current build/x86_64-unknown-linux-gnu/stage2`).
  * Clean and rebuild the codegen with `debug-current` in the file `rust-toolchain`.
- * Add `~/.rustup/toolchains/debug-current/lib/rustlib/x86_64-unknown-linux-gnu/lib` to `LD_LIBRARY_PATH`.
diff --git a/gcc_path b/gcc_path
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/gcc_path
+++ /dev/null