Skip to content
Snippets Groups Projects
Commit 6b8988ad authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

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

parents 17ed411b a4e8c47b
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment