Merge branch 'master' of git.astron.nl:ro/lofar

Docker/lofar-base/Dockerfile.tmpl

@@ -62,7 +62,20 @@ ENV CASACORE_VERSION=v3.1.0 \
 # Allow to specify the number of cpus as --build-arg.
 #
 ARG J=6
-ENV J=${J} CXX_FLAGS="--std=c++11 -W -Wall -Woverloaded-virtual -Wno-unknown-pragmas -D_GLIBCXX_USE_CXX11_ABI=${CXX_ABI} -O3 -march=haswell"
+ENV J=${J}
+
+# Allow to overwrite the default CXX_FLAGS settings for code compilation
+# by specifying --build-args CXX_FLAGS="blah blah"
+ARG CXX_FLAGS="--std=c++11 -W -Wall -Woverloaded-virtual -Wno-unknown-pragmas -D_GLIBCXX_USE_CXX11_ABI=${CXX_ABI} -O3"
+
+# Allow to overwrite the CPU optimisation default setting by specifying
+# --build-arg CPU_OPTIMISATION="native"
+ARG CPU_OPTIMISATION="haswell"
+ENV CPU_OPTIMISATION="-march=${CPU_OPTIMISATION}"
+
+# Combine CXX_FLAGS and CPU_OPTIMISATION
+ENV CXX_FLAGS="${CXX_FLAGS} ${CPU_OPTIMISATION}"
+
 
 #
 # Base and runtime dependencies