merge of '34be1e0ad58e29063ea95d33f2cdc090fd63c4b2'

     and 'fcc3affb2faabb6cf819877452cfc88201d4e1a0'

8 files changed, 10 insertions, 10 deletions

diff --git a/misc/config/cc/ekopath b/misc/config/cc/ekopath
index 084240e03..159672588 100644
--- a/misc/config/cc/ekopath
+++ b/misc/config/cc/ekopath
@@ -15,7 +15,7 @@ warning_flags "-W -Wall"
 
 ar_command "pathCC -ar -o"
 
-so_obj_flags "-fPIC"
+shared_flags "-fPIC"
 debug_flags "-g"
 
 dll_import_flags ""
diff --git a/misc/config/cc/gcc b/misc/config/cc/gcc
index 9d85dc049..538bfdbab 100644
--- a/misc/config/cc/gcc
+++ b/misc/config/cc/gcc
@@ -8,12 +8,12 @@ add_include_dir_option "-I"
 add_lib_dir_option "-L"
 add_lib_option "-l"
 
-lib_opt_flags "-O2 -finline-functions"
-check_opt_flags "-O2"
 lang_flags "-D_REENTRANT -ansi -Wno-long-long"
 warning_flags "-W -Wall"
 
-so_obj_flags "-fPIC"
+lib_opt_flags "-O0 -finline-functions"
+check_opt_flags "-O0"
+shared_flags "-fPIC"
 debug_flags "-g"
 
 dll_import_flags ""
diff --git a/misc/config/cc/hpcc b/misc/config/cc/hpcc
index 5732ba8f0..284e92ca6 100644
--- a/misc/config/cc/hpcc
+++ b/misc/config/cc/hpcc
@@ -14,7 +14,7 @@ debug_flags "-g"
 no_debug_flags ""
 lang_flags "-AA -ext +eh -z"
 warning_flags "" # +w
-so_obj_flags "+Z"
+shared_flags "+Z"
 
 dll_import_flags ""
 dll_export_flags ""
diff --git a/misc/config/cc/icc b/misc/config/cc/icc
index 23061add5..cf5b21298 100644
--- a/misc/config/cc/icc
+++ b/misc/config/cc/icc
@@ -14,7 +14,7 @@ debug_flags "-g"
 no_debug_flags "-fomit-frame-pointer"
 lang_flags ""
 warning_flags "-w1"
-so_obj_flags "-fPIC"
+shared_flags "-fPIC"
 
 dll_import_flags ""
 dll_export_flags ""
diff --git a/misc/config/cc/mipspro b/misc/config/cc/mipspro
index 4fe2e5ec3..b75fc4fb3 100644
--- a/misc/config/cc/mipspro
+++ b/misc/config/cc/mipspro
@@ -12,7 +12,7 @@ lib_opt_flags "-O3 -OPT:alias=TYPED"
 check_opt_flags "-O3 -OPT:alias=TYPED"
 debug_flags "-g3"
 no_debug_flags ""
-so_obj_flags "-KPIC"
+shared_flags "-KPIC"
 lang_flags "-ansi -LANG:ansi-for-init-scope=ON"
 # Disabled, because, while my code is fine, it warns about a lot of it's own
 # headers <g>
diff --git a/misc/config/cc/pgi b/misc/config/cc/pgi
index af170b8d1..35f466477 100644
--- a/misc/config/cc/pgi
+++ b/misc/config/cc/pgi
@@ -10,7 +10,7 @@ add_lib_option "-l"
 
 lib_opt_flags "-fast -Minline"
 check_opt_flags "-fast"
-so_obj_flags "-fPIC"
+shared_flags "-fPIC"
 
 dll_import_flags ""
 dll_export_flags ""
diff --git a/misc/config/cc/sgipro64 b/misc/config/cc/sgipro64
index 196e678e9..28132ffcc 100644
--- a/misc/config/cc/sgipro64
+++ b/misc/config/cc/sgipro64
@@ -12,7 +12,7 @@ lib_opt_flags "-O3 -OPT:alias=TYPED"
 check_opt_flags "-O3 -OPT:alias=TYPED"
 debug_flags "-g3"
 no_debug_flags ""
-so_obj_flags "-KPIC"
+shared_flags "-KPIC"
 lang_flags "-ansi -LANG:ansi-for-init-scope=ON"
 warning_flags "-Wall -W"
 
diff --git a/misc/config/cc/sunwspro b/misc/config/cc/sunwspro
index 41040c880..8ac19e80e 100644
--- a/misc/config/cc/sunwspro
+++ b/misc/config/cc/sunwspro
@@ -14,7 +14,7 @@ lib_opt_flags "-xO2"
 check_opt_flags "-xO2"
 debug_flags "-g"
 no_debug_flags ""
-so_obj_flags "-KPIC"
+shared_flags "-KPIC"
 warning_flags "+w"
 lang_flags "+p -D__EXTENSIONS__"