7 files changed, 15 insertions, 15 deletions
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 8b09831d6..0fbc67ce9 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -26,12 +26,12 @@ visibility_attribute '__attribute__((visibility("default")))'
 makefile_style gmake
 
 <so_link_commands>
-darwin        -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
-darwin-debug  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
+darwin        -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME_ABI)"
+darwin-debug  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME_ABI)"
 
 # 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)"
+default       -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME_ABI)"
+default-debug -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME_ABI)"
 </so_link_commands>
 
 <binary_link_commands>
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index 823eed7a9..a41abc7c4 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -22,7 +22,7 @@ shared_flags "-fPIC"
 makefile_style gmake
 
 <so_link_commands>
-default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
+default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME_ABI)"
 </so_link_commands>
 
 <mach_opt>
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 225440a35..877ce4d58 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -30,13 +30,13 @@ makefile_style gmake
 
 <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)"
+default       -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME_ABI)"
+default-debug -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME_ABI)"
 
 # Darwin, HP-UX and Solaris linkers use different syntax
-darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
-hpux    -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)"
-solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
+darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME_ABI)"
+hpux    -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME_ABI)"
+solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME_ABI)"
 
 # AIX and OpenBSD don't use sonames at all
 aix     -> "$(CXX) -shared -fPIC"
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
index 904e489c9..2e30995f6 100644
--- a/src/build-data/cc/hpcc.txt
+++ b/src/build-data/cc/hpcc.txt
@@ -25,5 +25,5 @@ hppa2.0 -> "+DA2.0W"
 </mach_abi_linking>
 
 <so_link_commands>
-default -> "$(CXX) +Z -b -Wl,+h,$(SONAME)" # Documented in cc(1), but not CC(1) (?)
+default -> "$(CXX) +Z -b -Wl,+h,$(SONAME_ABI)" # Documented in cc(1), but not CC(1) (?)
 </so_link_commands>
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index f15d9eb9c..f7fdf72be 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -30,5 +30,5 @@ westmere  -> "-march=core2"
 </mach_opt>
 
 <so_link_commands>
-default -> "$(CXX) -fPIC -shared -Wl,-soname,$(SONAME)"
+default -> "$(CXX) -fPIC -shared -Wl,-soname,$(SONAME_ABI)"
 </so_link_commands>
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index 50042388d..ca4b49cd9 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -16,8 +16,8 @@ shared_flags "-fPIC"
 makefile_style gmake
 
 <so_link_commands>
-linux   -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
-solaris -> "$(CXX) -G -fPIC -Wl,-h,$(SONAME)"
+linux   -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME_ABI)"
+solaris -> "$(CXX) -G -fPIC -Wl,-h,$(SONAME_ABI)"
 </so_link_commands>
 
 <mach_opt>
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index 37998e859..964c878ff 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -21,7 +21,7 @@ ar_command "CC -xar -o"
 makefile_style gmake
 
 <so_link_commands>
-default -> "$(CXX) -G -h$(SONAME)"
+default -> "$(CXX) -G -h$(SONAME_ABI)"
 </so_link_commands>
 
 <mach_opt>