diff --git a/kcc-tools.jam b/kcc-tools.jam
index 26eebd778..6a91bca19 100644
--- a/kcc-tools.jam
+++ b/kcc-tools.jam
@@ -7,6 +7,27 @@
 # This file is /NOT/ up-to-date; please use other toolset description
 # files as examples.
 
+
+
+flags kcc CFLAGS <debug-symbols>on : -g ;
+flags kcc LINKFLAGS <debug-symbols>on : -g ;
+flags kcc CFLAGS <optimization>off : +K0 ;
+flags kcc CFLAGS <optimization>speed : +K3 ;
+
+flags kcc CFLAGS <optimization>space : ;
+flags kcc CFLAGS <inlining>off : ;
+flags kcc CFLAGS <inlining>on : --inline_generated_space_time=10000 --inline_implicit_space_time=10000 --inline_keyword_space_time=10000 ;
+flags kcc CFLAGS <inlining>full :  --inline_auto_space_time=10000 --inline_generated_space_time=10000 --inline_implicit_space_time=10000 --inline_keyword_space_time=10000 ;
+
+flags kcc DEFINES <define> ;
+flags kcc UNDEFS <undef> ;
+flags kcc HDRS <include> ;
+
+flags kcc LIBPATH <library-path> ;
+flags kcc NEEDLIBS <library-file> ;
+flags kcc FINDLIBS <find-library> ;
+
+
 kcc.bin-directory = [ conditional $(kcc.root-directory) : $(kcc.root-directory)$(SLASH)bin$(SLASH) : " " ] ;
 detect-build-tools kcc : "KCC" ;
 
@@ -19,7 +40,7 @@ rule Link-action
 
 actions kcc-Link-action bind NEEDLIBS
 {
-    $(kcc.bin-directory)KCC $(LINKFLAGS) -o "$(<)" -L$(STDLIBPATH) "$(>)" NEEDLIBS
+    $(kcc.bin-directory)KCC $(LINKFLAGS) -o "$(<)" -L$(STDLIBPATH) "$(>)" $(NEEDLIBS) -lm
 }
 
 #### Cc #####
@@ -42,7 +63,7 @@ rule C++-action
 
 actions kcc-C++-action
 {
-    $(kcc.bin-directory)KCC -c $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
+    $(kcc.bin-directory)KCC -c -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
 }
 
 
diff --git a/v1/kcc-tools.jam b/v1/kcc-tools.jam
index 26eebd778..6a91bca19 100644
--- a/v1/kcc-tools.jam
+++ b/v1/kcc-tools.jam
@@ -7,6 +7,27 @@
 # This file is /NOT/ up-to-date; please use other toolset description
 # files as examples.
 
+
+
+flags kcc CFLAGS <debug-symbols>on : -g ;
+flags kcc LINKFLAGS <debug-symbols>on : -g ;
+flags kcc CFLAGS <optimization>off : +K0 ;
+flags kcc CFLAGS <optimization>speed : +K3 ;
+
+flags kcc CFLAGS <optimization>space : ;
+flags kcc CFLAGS <inlining>off : ;
+flags kcc CFLAGS <inlining>on : --inline_generated_space_time=10000 --inline_implicit_space_time=10000 --inline_keyword_space_time=10000 ;
+flags kcc CFLAGS <inlining>full :  --inline_auto_space_time=10000 --inline_generated_space_time=10000 --inline_implicit_space_time=10000 --inline_keyword_space_time=10000 ;
+
+flags kcc DEFINES <define> ;
+flags kcc UNDEFS <undef> ;
+flags kcc HDRS <include> ;
+
+flags kcc LIBPATH <library-path> ;
+flags kcc NEEDLIBS <library-file> ;
+flags kcc FINDLIBS <find-library> ;
+
+
 kcc.bin-directory = [ conditional $(kcc.root-directory) : $(kcc.root-directory)$(SLASH)bin$(SLASH) : " " ] ;
 detect-build-tools kcc : "KCC" ;
 
@@ -19,7 +40,7 @@ rule Link-action
 
 actions kcc-Link-action bind NEEDLIBS
 {
-    $(kcc.bin-directory)KCC $(LINKFLAGS) -o "$(<)" -L$(STDLIBPATH) "$(>)" NEEDLIBS
+    $(kcc.bin-directory)KCC $(LINKFLAGS) -o "$(<)" -L$(STDLIBPATH) "$(>)" $(NEEDLIBS) -lm
 }
 
 #### Cc #####
@@ -42,7 +63,7 @@ rule C++-action
 
 actions kcc-C++-action
 {
-    $(kcc.bin-directory)KCC -c $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
+    $(kcc.bin-directory)KCC -c -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
 }