Fix compilation error on Linux

- Removed undeaD from .gitignore - Added latest undeaD as a new submodule - Explicitly specify python2 - Fix gcc link flag
biod · Oct 11, 2017 · 5a16fba · 5a16fba
1 parent 3609790
commit 5a16fba
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 build/
-undeaD/
 shunit*
 /*.sam
 /*.bam

diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "lz4"]
 	path = lz4
 	url = https://github.com/Cyan4973/lz4
+[submodule "undeaD"]
+	path = undeaD
+	url = https://github.com/dlang/undeaD
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ endef
 
 else
 
-LINK_CMD=gcc -Wl,--gc-sections -o build/sambamba build/sambamba.o $(STATIC_LIB_SUBCMD) -l:libphobos2-ldc.a -l:libdruntime-ldc.a  -lrt -lpthread -lm -ldl
+LINK_CMD=gcc -Wl,--gc-sections -o build/sambamba build/sambamba.o $(STATIC_LIB_SUBCMD) -lphobos2-ldc -ldruntime-ldc  -lrt -lpthread -lm -ldl
 DMD_STATIC_LIBS=-L-Lhtslib -L-l:libhts.a -L-l:libphobos2.a -L-Llz4/lib -L-l:liblz4.a
 
 define split-debug

diff --git a/gen_ldc_version_info.py b/gen_ldc_version_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 from __future__ import print_function
 import re, sys, subprocess

diff --git a/undeaD b/undeaD