diff --git a/Templates/configure b/Templates/configure
index 8b416ba91..7f00d48de 100755
--- a/Templates/configure
+++ b/Templates/configure
@@ -2565,9 +2565,9 @@ fi
         CMAKE_SHLIB_RUNTIME_FLAG="-R "
         CMAKE_SHLIB_RUNTIME_SEP=":"
         if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
-	  CMAKE_SHLIB_BUILD_FLAGS='-Wl,-G'
+	  CMAKE_SHLIB_BUILD_FLAGS='-shared -nostdlib'
 	  CMAKE_SHLIB_LINK_FLAGS=''
-	  CMAKE_MODULE_BUILD_FLAGS='-Wl,-G'
+	  CMAKE_MODULE_BUILD_FLAGS='-shared -nostdlib'
 	  CMAKE_MODULE_LINK_FLAGS=''
           CMAKE_SHLIB_RUNTIME_FLAG="-Wl,-R,"
           CMAKE_SHLIB_RUNTIME_SEP=":"
diff --git a/Templates/configure.in b/Templates/configure.in
index d576ba341..3143a21a2 100644
--- a/Templates/configure.in
+++ b/Templates/configure.in
@@ -379,9 +379,9 @@ case $system in
         CMAKE_SHLIB_RUNTIME_FLAG="-R "
         CMAKE_SHLIB_RUNTIME_SEP=":"
         if test "$CC" = "gcc" -o `$CC -v 2>&1 | grep -c gcc` != "0" ; then
-	  CMAKE_SHLIB_BUILD_FLAGS='-Wl,-G'
+	  CMAKE_SHLIB_BUILD_FLAGS='-shared -nostdlib'
 	  CMAKE_SHLIB_LINK_FLAGS=''
-	  CMAKE_MODULE_BUILD_FLAGS='-Wl,-G'
+	  CMAKE_MODULE_BUILD_FLAGS='-shared -nostdlib'
 	  CMAKE_MODULE_LINK_FLAGS=''
           CMAKE_SHLIB_RUNTIME_FLAG="-Wl,-R,"
           CMAKE_SHLIB_RUNTIME_SEP=":"