Merge "Fix linkage when building with clang, Intel CC or gcc -O0"