aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-04-22 12:53:08 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-04-22 12:53:08 +0200
commitffea0c99f8ca0bfafeaa8cd10832527c0b344dd5 (patch)
treea11bec59a0ece3e1205da24bffb9c87d041912ce
parent6ffb412e275ba54a17b7f44285e7e23f88cdf26a (diff)
Add BOOST_LINK_SYSTEM flag for explicit libboost_system linking3.3.0xsd-3
-rw-r--r--README10
-rw-r--r--libbackend-elements/build/import/libboost/configuration-dynamic.make6
-rw-r--r--libxsd-frontend/build/import/libboost/configuration-dynamic.make6
-rw-r--r--xsd/build/import/libboost/configuration-dynamic.make6
4 files changed, 26 insertions, 2 deletions
diff --git a/README b/README
index 9189539..8f2d04a 100644
--- a/README
+++ b/README
@@ -21,13 +21,14 @@ the CPPFLAGS and LDFLAGS variables, respectively.
The build system supports the following variables:
CXX (defaults to g++ if not set)
+AR (defaults to ar if not set)
+RANLIB (defaults to ranlib if not set)
CPPFLAGS
CXXFLAGS
LDFALGS
LIBS
BOOST_LIB_SUFFIX
-AR (defaults to ar if not set)
-RANLIB (defaults to ranlib if not set)
+BOOST_LINK_SYSTEM
For example:
@@ -38,6 +39,11 @@ Boost library suffix. For example, if your Boost library names are
in the libboost_regex-gcc41-mt-d.so format, then you will need to
set BOOST_LIB_SUFFIX to -gcc41-mt-d.
+The BOOST_LINK_SYSTEM variable allows you to specify whether the
+Boost system library should be explicitly linked to which may be
+required by newer linkers. The valid values are 'y' (default) and
+'n'.
+
If you would like to see the full compiler/linker/etc., command lines,
you can add verbose=1 to the make command line:
diff --git a/libbackend-elements/build/import/libboost/configuration-dynamic.make b/libbackend-elements/build/import/libboost/configuration-dynamic.make
index 5d5209b..ab55882 100644
--- a/libbackend-elements/build/import/libboost/configuration-dynamic.make
+++ b/libbackend-elements/build/import/libboost/configuration-dynamic.make
@@ -1,2 +1,8 @@
libboost_installed := y
libboost_suffix := $(BOOST_LIB_SUFFIX)
+
+ifeq ($(BOOST_LINK_SYSTEM),n)
+libboost_system := n
+else
+libboost_system := y
+endif
diff --git a/libxsd-frontend/build/import/libboost/configuration-dynamic.make b/libxsd-frontend/build/import/libboost/configuration-dynamic.make
index 5d5209b..ab55882 100644
--- a/libxsd-frontend/build/import/libboost/configuration-dynamic.make
+++ b/libxsd-frontend/build/import/libboost/configuration-dynamic.make
@@ -1,2 +1,8 @@
libboost_installed := y
libboost_suffix := $(BOOST_LIB_SUFFIX)
+
+ifeq ($(BOOST_LINK_SYSTEM),n)
+libboost_system := n
+else
+libboost_system := y
+endif
diff --git a/xsd/build/import/libboost/configuration-dynamic.make b/xsd/build/import/libboost/configuration-dynamic.make
index 5d5209b..ab55882 100644
--- a/xsd/build/import/libboost/configuration-dynamic.make
+++ b/xsd/build/import/libboost/configuration-dynamic.make
@@ -1,2 +1,8 @@
libboost_installed := y
libboost_suffix := $(BOOST_LIB_SUFFIX)
+
+ifeq ($(BOOST_LINK_SYSTEM),n)
+libboost_system := n
+else
+libboost_system := y
+endif