diff --git a/configure b/configure
index e8d3a7604729a571543842370149afd443550793..36e8c25fa78f02809064554cd91b6dd406a865ee 100755
--- a/configure
+++ b/configure
@@ -1699,14 +1699,14 @@ if test "$enable_debugging" = yes; then
 	OPTIMIZE=-g
 fi
 
-EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS} ${OPTIMIZE}"
+EXTRA_CXXFLAGS="$(EXTRA_CXXFLAGS) $(OPTIMIZE)"
 
 
 
 
 
 
-ac_config_files="$ac_config_files tools/Makefile tools/selective_cfi/Makefile tools/watch_syscall/Makefile tools/transforms/Makefile libIRDB/src/syscall/Makefile libIRDB/test/Makefile"
+ac_config_files="$ac_config_files tools/Makefile tools/selective_cfi/Makefile tools/watch_syscall/Makefile tools/transforms/Makefile tools/cgc_hlx/Makefile libIRDB/src/syscall/Makefile libIRDB/test/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -2417,6 +2417,7 @@ do
     "tools/selective_cfi/Makefile") CONFIG_FILES="$CONFIG_FILES tools/selective_cfi/Makefile" ;;
     "tools/watch_syscall/Makefile") CONFIG_FILES="$CONFIG_FILES tools/watch_syscall/Makefile" ;;
     "tools/transforms/Makefile") CONFIG_FILES="$CONFIG_FILES tools/transforms/Makefile" ;;
+    "tools/cgc_hlx/Makefile") CONFIG_FILES="$CONFIG_FILES tools/cgc_hlx/Makefile" ;;
     "libIRDB/src/syscall/Makefile") CONFIG_FILES="$CONFIG_FILES libIRDB/src/syscall/Makefile" ;;
     "libIRDB/test/Makefile") CONFIG_FILES="$CONFIG_FILES libIRDB/test/Makefile" ;;