Some fixes to the build system

Author: edomora97

cmake/RemoveFlags.cmake

@@ -79,8 +79,10 @@ macro(remove_flag_from_file _target _file _flag)
       endif()
     endif()
     # Remove the specified flag, then re-apply the rest.
-    list(REMOVE_ITEM _cached_${_target}_${_file}_cxx_flags ${_flag})
-    string(REPLACE ";" " " _cached_${_target}_${_file}_cxx_flags_string "${_cached_${_target}_${_file}_cxx_flags}")
-    set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "${_cached_${_target}_${_file}_cxx_flags_string}")
+    if (_cached_${_target}_${_file}_cxx_flags)
+      list(REMOVE_ITEM _cached_${_target}_${_file}_cxx_flags ${_flag})
+      string(REPLACE ";" " " _cached_${_target}_${_file}_cxx_flags_string "${_cached_${_target}_${_file}_cxx_flags}")
+      set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "${_cached_${_target}_${_file}_cxx_flags_string}")
+    endif()
   endif()
 endmacro()

tools/archlinux/Dockerfile

@@ -1,4 +1,4 @@
-FROM base/archlinux
+FROM archlinux/base
 MAINTAINER Edoardo Morassutto <[email protected]>
 
 RUN mkdir -p /build
@@ -10,9 +10,7 @@ ENV UGID='2000' UGNAME='travis'
 # setup the system
 RUN groupadd --gid "$UGID" "$UGNAME" && \
     useradd --create-home --uid "$UGID" --gid "$UGID" "${UGNAME}" && \
-    echo 'Server = http://mirrors.evowise.com/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist && \
-    echo 'Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist && \
-    echo 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist && \
+    curl "https://www.archlinux.org/mirrorlist/?country=all&protocol=https&ip_version=4&ip_version=6&use_mirror_status=on" | sed 's/^#//g' > /etc/pacman.d/mirrorlist && \
     pacman -Syu --needed --noconfirm base-devel git sudo yajl && \
     pacman -Scc --noconfirm && \
     echo "travis ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$UGNAME