9 files changed, 24 insertions, 24 deletions
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index d9de36dba..d2d2f9928 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -25,19 +25,19 @@ visibility_attribute '__attribute__((visibility("default")))'
 
 makefile_style gmake
 
-<so_link_flags>
+<so_link_commands>
 # The default works for GNU ld and several other Unix linkers
 default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
 
 darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
-</so_link_flags>
+</so_link_commands>
 
-<binary_link_command>
+<binary_link_commands>
 linux         -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
 linux-debug   -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
 default       -> "$(LINKER)"
 default-debug -> "$(LINKER)"
-</binary_link_command>
+</binary_link_commands>
 
 <isa_flags>
 sse2   -> "-msse2"
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index 2390c3cd2..823eed7a9 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -21,9 +21,9 @@ shared_flags "-fPIC"
 
 makefile_style gmake
 
-<so_link_flags>
+<so_link_commands>
 default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
-</so_link_flags>
+</so_link_commands>
 
 <mach_opt>
 athlon   -> "-mcpu=athlon"
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index c0cb258fb..225440a35 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -28,7 +28,7 @@ visibility_attribute '__attribute__((visibility("default")))'
 
 makefile_style gmake
 
-<so_link_flags>
+<so_link_commands>
 # The default works for GNU ld and several other Unix linkers
 default       -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
 default-debug -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
@@ -41,14 +41,14 @@ solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
 # AIX and OpenBSD don't use sonames at all
 aix     -> "$(CXX) -shared -fPIC"
 openbsd -> "$(CXX) -shared -fPIC"
-</so_link_flags>
+</so_link_commands>
 
-<binary_link_command>
+<binary_link_commands>
 linux         -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
 linux-debug   -> "$(LINKER) -Wl,-rpath=\$$ORIGIN"
 default       -> "$(LINKER)"
 default-debug -> "$(LINKER)"
-</binary_link_command>
+</binary_link_commands>
 
 <isa_flags>
 sse2    -> "-msse2"
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
index 0e7f6b6ab..904e489c9 100644
--- a/src/build-data/cc/hpcc.txt
+++ b/src/build-data/cc/hpcc.txt
@@ -24,6 +24,6 @@ hppa1.1 -> "+DA1.1"
 hppa2.0 -> "+DA2.0W"
 </mach_abi_linking>
 
-<so_link_flags>
+<so_link_commands>
 default -> "$(CXX) +Z -b -Wl,+h,$(SONAME)" # Documented in cc(1), but not CC(1) (?)
-</so_link_flags>
+</so_link_commands>
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index 43b9a524e..f15d9eb9c 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -29,6 +29,6 @@ nehalem   -> "-march=core2"
 westmere  -> "-march=core2"
 </mach_opt>
 
-<so_link_flags>
+<so_link_commands>
 default -> "$(CXX) -fPIC -shared -Wl,-soname,$(SONAME)"
-</so_link_flags>
+</so_link_commands>
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index 30b795a57..7a35f9648 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -35,15 +35,15 @@ clmul  -> ""
 rdrand -> ""
 </isa_flags>
 
-<so_link_flags>
+<so_link_commands>
 default       -> "$(LINKER) /DLL"
 default-debug -> "$(LINKER) /DLL /DEBUG"
-</so_link_flags>
+</so_link_commands>
 
-<binary_link_command>
+<binary_link_commands>
 default       -> "$(LINKER)"
 default-debug -> "$(LINKER) /DEBUG"
-</binary_link_command>
+</binary_link_commands>
 
 <mach_abi_linking>
 all       -> "/MD"
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index 3ef16c7df..50042388d 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -15,10 +15,10 @@ shared_flags "-fPIC"
 
 makefile_style gmake
 
-<so_link_flags>
+<so_link_commands>
 linux   -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
 solaris -> "$(CXX) -G -fPIC -Wl,-h,$(SONAME)"
-</so_link_flags>
+</so_link_commands>
 
 <mach_opt>
 i586     -> "-tp p5"
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index c8673a8c1..37998e859 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -20,9 +20,9 @@ ar_command "CC -xar -o"
 
 makefile_style gmake
 
-<so_link_flags>
+<so_link_commands>
 default -> "$(CXX) -G -h$(SONAME)"
-</so_link_flags>
+</so_link_commands>
 
 <mach_opt>
 i386       -> "-xtarget=486"
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index 78fda3198..68dc62582 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -23,6 +23,6 @@ power4   -> "-qarch=pwr4"
 power5   -> "-qarch=pwr5"
 </mach_opt>
 
-<so_link_flags>
+<so_link_commands>
 default -> "$(CXX) -qmkshrobj"
-</so_link_flags>
+</so_link_commands>