diff --git a/scripts/common_tools.sh b/scripts/common_tools.sh
index 3b808cc92..67db75e36 100644
--- a/scripts/common_tools.sh
+++ b/scripts/common_tools.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # Source build-env.sh if found.
-SCRIPT_DIR=`dirname $0`
+CWD=`readlink -f $0`
+SCRIPT_DIR=`dirname ${CWD}`
 if [ -e "${SCRIPT_DIR}/build-env.sh" ] ; then
     source "${SCRIPT_DIR}/build-env.sh"
 fi
@@ -868,7 +869,7 @@ compile_cpp_for_target()
         # configure makefiles first so compile_commands.json gets exported
         mkdir -p "hack"
         pushd "hack" > /dev/null
-        eval "$(../../scripts/vcvarsall.sh x64)"
+        eval "$(${SCRIPT_DIR}/vcvarsall.sh x64)"
         echo "ECHO ${CMAKE} ${CMAKE_EXTRA_ARGS} -G ${NMAKE_CMAKE_GENERATOR} ${CMAKE_ARGS[@]} ${TOOLCHAIN_FILE} ${PREFIX_PATH} ${CMAKELISTS_DIR}"
         "${CMAKE}" ${CMAKE_EXTRA_ARGS} -G "${NMAKE_CMAKE_GENERATOR}" "${CMAKE_ARGS[@]}" "${TOOLCHAIN_FILE}" "${PREFIX_PATH}" "${CMAKELISTS_DIR}"
         local CMAKE_RESULT=$?