diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-06 10:24:46 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-06 10:24:46 +0100 |
| commit | 372a0e99c2f61543d9e14d9933b59d9d1f4cb26e (patch) | |
| tree | bbadf39aed0610c8f8f7b41fefff47773b8ac205 /xsd/build/cxx | |
| parent | 23d41842168ac1a1580111b9c5c73500ceee3d57 (diff) | |
| parent | 4538829ab86b5a1cd4e845e7eab165029c9d6d46 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'xsd/build/cxx')
| -rw-r--r-- | xsd/build/cxx/configuration-dynamic.make | 11 | ||||
| -rw-r--r-- | xsd/build/cxx/generic/configuration-dynamic.make | 16 |
2 files changed, 0 insertions, 27 deletions
diff --git a/xsd/build/cxx/configuration-dynamic.make b/xsd/build/cxx/configuration-dynamic.make deleted file mode 100644 index 83cf860..0000000 --- a/xsd/build/cxx/configuration-dynamic.make +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index f35ea66..0000000 --- a/xsd/build/cxx/generic/configuration-dynamic.make +++ /dev/null @@ -1,16 +0,0 @@ -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 |