Update Makefile

diff --git a/.gitmodules b/.gitmodules
index f3f772bf9aa0e2e7b339ab922f4e0618724ef79f..2f0e69e30fa3385887e7074af78624ce5c451fe4 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "openmp"]
        path = openmp
        url = https://iis-git.ee.ethz.ch/H2020-Compiler/openmp
+[submodule "HerculesCompiler"]
+       path = HerculesCompiler
+       url = https://iis-git.ee.ethz.ch/H2020-Compiler/HerculesCompiler

diff --git a/HerculesCompiler b/HerculesCompiler
new file mode 160000 (submodule)
index 0000000..ce8c623
--- /dev/null
+++ b/HerculesCompiler
@@ -0,0 +1 @@
+Subproject commit ce8c623e21f4ae874be5fd9b7d26f16edca294e9

diff --git a/Makefile b/Makefile
index 166faeef1c8dccd04201d0cc20c690f790009811..5878c5226e92b50169f502b341c7f67bff065e7f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PREFIX = $(HOME)/opt/hercules-compiler
-all: build/bin/clang
+all: build/bin/opt
 
-build/bin/clang: build/build.ninja
+build/bin/opt: build/build.ninja
        ninja -C build
 
 llvm/tools/clang:
@@ -30,7 +30,7 @@ LLVM_CROSS_FLAGS += -DLLVM_TARGET_ARCH=$(DEB_TARGET_GNU_CPU)
 endif
 
 
-build/build.ninja: build llvm/tools/clang llvm/projects/openmp
+build/build.ninja: | build llvm/tools/clang llvm/projects/openmp
 #      printenv | sort
        cd $(@D) && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX="$(PREFIX)" \
                -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_ENABLE_BACKTRACES=ON -DLLVM_ENABLE_WERROR=OFF \

diff --git a/debian/control b/debian/control
index 33955e11dc74ec472a8149a0a3aca734dc01ada0..11e2309d4d2fbd5c187d3062e2a11029cce9db82 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Michal Sojka <michal.sojka@cvut.cz>
 Build-Depends: debhelper (>= 9), cmake, ninja-build, python3
 Standards-Version: 3.9.8
-Homepage: https://iis-git.ee.ethz.ch/H2020-Compiler/llvm
+Homepage: https://iis-git.ee.ethz.ch/H2020-Compiler/HerculesCompiler
 #Vcs-Git: https://anonscm.debian.org/collab-maint/hercules-compiler.git
 #Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/hercules-compiler.git