Update

Author: GHakansson

Dockerfile.armv7hf

@@ -47,7 +47,9 @@ RUN sed -i 's#export PATH=#export PATH=/opt/axis/acapsdk/axis-acap-manifest-tool
 # Update paths and add explicit sdk path to linker in environment-setup script
 # Add the --disable-new-dtags parameter to the default LDFLAGS to solve dynamic library rpath issues
 RUN sed -i 's:/opt/axis/sdk:/opt/axis/acapsdk:g' /opt/axis/acapsdk/environment-setup* && \
-  sed -i '/\(CC\|CPP\|CXX\)=/s:"$: -L$SDKTARGETSYSROOT/usr/lib -D_TIME_BITS=32 -D_FILE_OFFSET_BITS=32":g' /opt/axis/acapsdk/environment-setup* && \
+  sed -i '/\(CC\|CPP\|CXX\)=/s:"$: -L$SDKTARGETSYSROOT/usr/lib":g' /opt/axis/acapsdk/environment-setup* && \
+  sed -i '/\(CC\|CPP\|CXX\)=/s:"$: -D_TIME_BITS=32":g' /opt/axis/acapsdk/environment-setup* && \
+  sed -i '/\(CC\|CPP\|CXX\)=/s:"$: -D_FILE_OFFSET_BITS=32":g' /opt/axis/acapsdk/environment-setup* && \
   sed -i '/^export LDFLAGS=/ s:"$: -Wl,--disable-new-dtags":' /opt/axis/acapsdk/environment-setup*
 
 # Copy the lib, include and .pc files from the API container