diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2faec56d5..fb68b962f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -599,10 +599,12 @@ if(NOT VOLK_GNSSSDR_FOUND)
         message(FATAL_ERROR "six - python 2 and 3 compatibility library required to build VOLK_GNSSSDR")
     endif(NOT SIX_FOUND)
 
+    set(READ_ENVIRO "")
     if(ENABLE_PACKAGING)
         if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
             set(STRIP_VOLK_GNSSSDR_PROFILE "-DENABLE_STRIP=ON -DCMAKE_VERBOSE_MAKEFILE=ON")
         endif(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
+        set(READ_ENVIRO "${CMAKE_COMMAND} -E environment")
     endif(ENABLE_PACKAGING)
 
     set(VOLK_GNSSSDR_BUILD_COMMAND "${CMAKE_MAKE_PROGRAM}")
@@ -638,11 +640,11 @@ if(NOT VOLK_GNSSSDR_FOUND)
          PREFIX ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module
          SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr
          BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build
-         CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
+         CMAKE_ARGS ${READ_ENVIRO} ${VOLK_GNSSSDR_CMAKE_ARGS}
          DOWNLOAD_COMMAND ""
          UPDATE_COMMAND ""
          PATCH_COMMAND ""
-         BUILD_COMMAND ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
+         BUILD_COMMAND ${READ_ENVIRO} ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
          INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
          )
     else(CMAKE_VERSION VERSION_LESS 3.2)
@@ -650,11 +652,11 @@ if(NOT VOLK_GNSSSDR_FOUND)
          PREFIX ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module
          SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr
          BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build
-         CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
+         CMAKE_ARGS ${READ_ENVIRO} ${VOLK_GNSSSDR_CMAKE_ARGS}
          DOWNLOAD_COMMAND ""
          UPDATE_COMMAND ""
          PATCH_COMMAND ""
-         BUILD_COMMAND ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
+         BUILD_COMMAND ${READ_ENVIRO} ${VOLK_GNSSSDR_BUILD_COMMAND} volk_gnsssdr_profile
          BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}volk_gnsssdr${CMAKE_STATIC_LIBRARY_SUFFIX}
                           ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install/bin/volk_gnsssdr_profile
          INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
index 738bce42d..0534fa62b 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
@@ -88,6 +88,7 @@ if(UNIX)
     add_definitions( -D_LARGEFILE_SOURCE
                      -D_FILE_OFFSET_BITS=64
                      -D_LARGE_FILES
+                     -D_FORTIFY_SOURCE=2
                    )
 endif(UNIX)
 
@@ -306,7 +307,7 @@ message(STATUS "  Modify using: -DENABLE_TESTING=ON/OFF")
 OPTION(ENABLE_PROFILING "Launch system profiler after build" OFF)
 if(ENABLE_PROFILING)
   set(ENABLE_STATIC_LIBS ON)
-  if(DEFINED VOLK_CONFIGPATH)  
+  if(DEFINED VOLK_CONFIGPATH)
     get_filename_component(VOLK_CONFIGPATH ${VOLK_CONFIGPATH} ABSOLUTE)
     set(VOLK_CONFIGPATH "${VOLK_CONFIGPATH}/volk_gnsssdr")
     message(STATUS "System profiling is enabled, using path: ${VOLK_CONFIGPATH}")
@@ -326,7 +327,7 @@ else()
 endif()
 message(STATUS "  Modify using: -DENABLE_PROFILING=ON/OFF")
 ########################################################################
- 
+
 ########################################################################
 # Setup the library
 ########################################################################