diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2014-02-25 10:08:02 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-02-25 10:08:02 +0200 |
| commit | 27142799b33dabc075f660e5de8ab375a1ac9314 (patch) | |
| tree | c9b279c24fd1b80985bec7c952fb9598ca97e3b4 /xsde/build/cxx | |
| parent | 7f23a534f3ed0b9c79a7f7c5c01648a7a4fcff70 (diff) | |
Update and improve for new dependencies
Diffstat (limited to 'xsde/build/cxx')
| -rw-r--r-- | xsde/build/cxx/configuration-dynamic.make | 5 | ||||
| -rw-r--r-- | xsde/build/cxx/generic/configuration-dynamic.make | 16 | ||||
| -rw-r--r-- | xsde/build/cxx/gnu/configuration-dynamic.make | 8 |
3 files changed, 17 insertions, 12 deletions
diff --git a/xsde/build/cxx/configuration-dynamic.make b/xsde/build/cxx/configuration-dynamic.make index 568ab40..83cf860 100644 --- a/xsde/build/cxx/configuration-dynamic.make +++ b/xsde/build/cxx/configuration-dynamic.make @@ -1,7 +1,4 @@ -cxx_id := gnu -cxx_optimize := n -cxx_debug := n -cxx_rpath := n +cxx_id := generic cxx_pp_extra_options := $(CPPFLAGS) cxx_extra_options := $(CXXFLAGS) cxx_ld_extra_options := $(LDFLAGS) diff --git a/xsde/build/cxx/generic/configuration-dynamic.make b/xsde/build/cxx/generic/configuration-dynamic.make new file mode 100644 index 0000000..f35ea66 --- /dev/null +++ b/xsde/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 diff --git a/xsde/build/cxx/gnu/configuration-dynamic.make b/xsde/build/cxx/gnu/configuration-dynamic.make deleted file mode 100644 index f3fe64d..0000000 --- a/xsde/build/cxx/gnu/configuration-dynamic.make +++ /dev/null @@ -1,8 +0,0 @@ -ifneq ($(CXX),) -cxx_gnu := $(CXX) -else -cxx_gnu := g++ -endif - -cxx_gnu_libraries := -cxx_gnu_optimization_options := |