commit 545c6c133de700785876959efbeb7a2987dcf2c7
author Nicolas "Pixel" Noble <pixel@nobis-crew.org> Thu Jan 28 06:01:46 2016 +0100
committer Nicolas "Pixel" Noble <pixel@nobis-crew.org> Thu Jan 28 06:01:46 2016 +0100
tree f57ff3ee99aa02fe5cc81fa0b638eb738ae3c2ca
parent 4500034c03e5de1b6aea70ae11b8cf1e77e50629
parent f846aaf41baf34d68f9aa7e3daa2c65cd75dd7f1

Merge branch 'master' into makefile-cleanup

Conflicts:
	Makefile
	templates/Makefile.template

build.yaml

diff --git a/build.yaml b/build.yaml
index f7c4df0..ba9f53e 100644
--- a/build.yaml
+++ b/build.yaml
@@ -2555,7 +2555,7 @@
       -fPIE -pie $(if $(JENKINS_BUILD),-Wl$(comma)-Ttext-segment=0x7e0000000000,)
     LDXX: clang++
     compile_the_world: true
-    timeout_multiplier: 1.5
+    timeout_multiplier: 2
   mutrace:
     CPPFLAGS: -O0
     DEFINES: _DEBUG DEBUG
@@ -2599,7 +2599,7 @@
     LDFLAGS: -g
   zlib:
     CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration
-      -fvisibility=hidden
+      $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden
 node_modules:
 - deps:
   - grpc