Browse Source

Merge branch 'master' of https://github.com/odin-lang/Odin

gingerBill 2 years ago
parent
commit
380905618a
3 changed files with 4 additions and 1 deletions
  1. 1 0
      .github/workflows/nightly.yml
  2. 1 0
      .gitignore
  3. 2 1
      build_odin.sh

+ 1 - 0
.github/workflows/nightly.yml

@@ -50,6 +50,7 @@ jobs:
         run: |
           mkdir dist
           cp odin dist
+          cp libLLVM*.so dist
           cp -r shared dist
           cp -r core dist
           cp -r vendor dist

+ 1 - 0
.gitignore

@@ -271,6 +271,7 @@ odin
 odin.dSYM
 *.bin
 demo.bin
+libLLVM*.so
 
 # shared collection
 shared/

+ 2 - 1
build_odin.sh

@@ -99,7 +99,8 @@ config_linux() {
 
 	LDFLAGS="$LDFLAGS -ldl"
 	CXXFLAGS="$CXXFLAGS $($LLVM_CONFIG --cxxflags --ldflags)"
-	LDFLAGS="$LDFLAGS $($LLVM_CONFIG --libs core native --system-libs)"
+	LDFLAGS="$LDFLAGS $($LLVM_CONFIG  --libs core native --system-libs --libfiles) -Wl,-rpath=\$ORIGIN"
+	cp $($LLVM_CONFIG --libfiles) ./
 }
 
 build_odin() {