Skip to content
Snippets Groups Projects
Commit fc141fee authored by Thomas Juerges's avatar Thomas Juerges
Browse files

ROHD-2434: Docker falls over a '=' in --build-arg params

Remove the -march=soandso and just pass soandso as build arg
and take care of setting the -march and -mtune parameters in
the Dockerfile.
parent eacdc0c1
No related branches found
No related tags found
2 merge requests!138Lofar release 4 0,!130Resolve ROHD-2434 "Bug fix lofar docker base cpu optimisation"
......@@ -69,12 +69,12 @@ ENV J=${J}
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="-march=native"
ARG CPU_OPTIMISATION="-march=haswell"
ENV CPU_OPTIMISATION=${CPU_OPTIMISATION}
# --build-arg CPU_OPTIMISATION="native"
ARG CPU_OPTIMISATION="haswell"
ENV CPU_OPTIMISATION="-march=${CPU_OPTIMISATION} -mtune=${CPU_OPTIMISATION}"
# Combine CXX_FLAGS and CPU_OPTIMISATION
ENV CXX_FLAGS=${CXXFLAGS} ${CPU_OPTIMISATION}
ENV CXX_FLAGS="${CXXFLAGS} ${CPU_OPTIMISATION}"
#
......
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