diff --git a/gpAux/Makefile.global b/gpAux/Makefile.global
index c6adb981ec7cd91ab4a06e85c56f9cb5120727f9..29148e57810a0df962e9333139605e8e82834349 100644
--- a/gpAux/Makefile.global
+++ b/gpAux/Makefile.global
@@ -34,7 +34,7 @@ export MPP_ARCH=$($(BLD_ARCH)_MPP_ARCH)
 endif
 
 # take over the gcc version we use
-BLD_CC=gcc
+BLD_CC=$(shell which gcc)
 hpux_ia64_CC=gcc
 osx106_x86_CC=gcc
 
diff --git a/src/backend/codegen/CMakeLists.txt b/src/backend/codegen/CMakeLists.txt
index 7479aaf7a590e5239a7de17f53cbc925865c2f8c..fec2e4f134f0f870cd2926cb71bd513690dd7290 100644
--- a/src/backend/codegen/CMakeLists.txt
+++ b/src/backend/codegen/CMakeLists.txt
@@ -313,7 +313,7 @@ function(add_cmockery_gtest TEST_NAME TEST_SOURCES)
     )
     target_include_directories(${TEST_NAME} PUBLIC ${TEST_LIB_INC_DIRECTORIES})
     # Bring these from $ENV{LIBS}
-    target_link_libraries(${TEST_NAME} "-ldl -lbz2 -lxml2 -lz -lm -lcurl -L../../port -lpgport_srv" gpcodegen gtest)
+    target_link_libraries(${TEST_NAME} "-lnetsnmp -lpam -lxml2 -lpgport -lbz2 -lrt -lz -lreadline -lcrypt -ldl -lm -lcurl -L../../port -lpgport_srv" gpcodegen gtest)
     add_test(${TEST_NAME} ${TEST_NAME})
     add_dependencies(check ${TEST_NAME})
 endfunction(add_cmockery_gtest)