From 78989ebb445af2c6462ae2bf05ffd588d76610e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sat, 26 Jul 2014 16:31:27 +0200
Subject: Imported Upstream version 2.3.2

---
 src/engine/SCons/Tool/link.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/engine/SCons/Tool/link.xml')

diff --git a/src/engine/SCons/Tool/link.xml b/src/engine/SCons/Tool/link.xml
index e639d61..e0360ec 100644
--- a/src/engine/SCons/Tool/link.xml
+++ b/src/engine/SCons/Tool/link.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
+Copyright (c) 2001 - 2014 The SCons Foundation
 
 This file is processed by the bin/SConsDoc.py module.
 See its __doc__ string for a discussion of the format.
@@ -21,7 +21,7 @@ See its __doc__ string for a discussion of the format.
 
 <sconsdoc xmlns="http://www.scons.org/dbxsd/v1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0/scons.xsd scons.xsd">
+          xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 
 <tool name="link">
 <summary>
@@ -223,4 +223,13 @@ for the variable that expands to library search path options.
 </summary>
 </cvar>
 
-</sconsdoc>
\ No newline at end of file
+<cvar name="STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME">
+  <summary>
+    <para>
+      When this variable is true, static objects and shared objects are assumed to be the same; that is, SCons does not check for linking static objects into a shared library.
+    </para>
+  </summary>
+</cvar>
+
+
+</sconsdoc>
-- 
cgit v1.2.3