remerge

2 files changed, 27 insertions, 0 deletions

diff --git a/xsd/build/cxx/configuration-dynamic.make b/xsd/build/cxx/configuration-dynamic.make
new file mode 100644
index 0000000..83cf860
--- /dev/null
+++ b/xsd/build/cxx/configuration-dynamic.make
@@ -0,0 +1,11 @@
+cxx_id               := generic
+cxx_pp_extra_options := $(CPPFLAGS)
+cxx_extra_options    := $(CXXFLAGS)
+cxx_ld_extra_options := $(LDFLAGS)
+cxx_extra_libs       := $(LIBS)
+
+r := $(shell echo $(LDFLAGS) | sed -e 's/-L *\([^ ]*\)/-L\1/g')
+r := $(patsubst -L%,%,$(filter -L%,$(r)))
+r := $(shell echo $(r) | sed -e 's/ /:/g')
+
+cxx_extra_lib_paths  := $(r)
diff --git a/xsd/build/cxx/generic/configuration-dynamic.make b/xsd/build/cxx/generic/configuration-dynamic.make
new file mode 100644
index 0000000..f35ea66
--- /dev/null
+++ b/xsd/build/cxx/generic/configuration-dynamic.make
@@ -0,0 +1,16 @@
+ifeq ($(filter $(origin CXX),undefined default),)
+cxx_generic := $(CXX)
+else
+cxx_generic := g++
+endif
+
+r := $(shell $(cxx_generic) $(cxx_extra_options) $(cxx_ld_extra_options) \
+-print-search-dirs 2>&1 | sed -e 's/libraries: =//p' -e d)
+
+ifneq ($r,)
+  ifeq ($(cxx_extra_lib_paths),)
+    cxx_extra_lib_paths := $r
+  else
+    cxx_extra_lib_paths := $(cxx_extra_lib_paths):$r
+  endif
+endif