Browse Source

Merge pull request #2093 from flplv/master

Change llvm-copy-to-zip path to use real one, instead of link
Jeroen van Rijn 2 years ago
parent
commit
97477ee51c
2 changed files with 6 additions and 2 deletions
  1. 1 1
      .gitignore
  2. 5 1
      build_odin.sh

+ 1 - 1
.gitignore

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

+ 5 - 1
build_odin.sh

@@ -100,7 +100,11 @@ config_linux() {
 	LDFLAGS="$LDFLAGS -ldl"
 	LDFLAGS="$LDFLAGS -ldl"
 	CXXFLAGS="$CXXFLAGS $($LLVM_CONFIG --cxxflags --ldflags)"
 	CXXFLAGS="$CXXFLAGS $($LLVM_CONFIG --cxxflags --ldflags)"
 	LDFLAGS="$LDFLAGS $($LLVM_CONFIG  --libs core native --system-libs --libfiles) -Wl,-rpath=\$ORIGIN"
 	LDFLAGS="$LDFLAGS $($LLVM_CONFIG  --libs core native --system-libs --libfiles) -Wl,-rpath=\$ORIGIN"
-	cp $($LLVM_CONFIG --libfiles) ./
+
+	# Creates a copy of the llvm library in the build dir, this is meant to support compiler explorer.
+	# The annoyance is that this copy can be cluttering the development folder. TODO: split staging folders
+	# for development and compiler explorer builds
+	cp $(readlink -f $($LLVM_CONFIG --libfiles)) ./
 }
 }
 
 
 build_odin() {
 build_odin() {