aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2009-10-04 18:32:21 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2009-10-04 18:32:21 +0200
commitc43e1a29632c16562327c252aa5cde395204cf0f (patch)
tree58e0eb9a8ab15d90f42e50f380c6157206c9bcfd
parent7e8582b9cf7325ae049ddf0ea756512efd08eab8 (diff)
Use generic C++ compiler instead of GNU
-rw-r--r--cli/build/cxx/configuration-dynamic.make5
-rw-r--r--cli/build/cxx/generic/configuration-dynamic.make5
-rw-r--r--cli/build/cxx/gnu/configuration-dynamic.make8
-rw-r--r--libcutl/build/cxx/configuration-dynamic.make5
-rw-r--r--libcutl/build/cxx/generic/configuration-dynamic.make5
-rw-r--r--libcutl/build/cxx/gnu/configuration-dynamic.make8
6 files changed, 12 insertions, 24 deletions
diff --git a/cli/build/cxx/configuration-dynamic.make b/cli/build/cxx/configuration-dynamic.make
index fa9bd03..4e2dee5 100644
--- a/cli/build/cxx/configuration-dynamic.make
+++ b/cli/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)
diff --git a/cli/build/cxx/generic/configuration-dynamic.make b/cli/build/cxx/generic/configuration-dynamic.make
new file mode 100644
index 0000000..d1672cf
--- /dev/null
+++ b/cli/build/cxx/generic/configuration-dynamic.make
@@ -0,0 +1,5 @@
+ifneq ($(CXX),)
+cxx_generic := $(CXX)
+else
+cxx_generic := g++
+endif
diff --git a/cli/build/cxx/gnu/configuration-dynamic.make b/cli/build/cxx/gnu/configuration-dynamic.make
deleted file mode 100644
index b432d56..0000000
--- a/cli/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 :=
diff --git a/libcutl/build/cxx/configuration-dynamic.make b/libcutl/build/cxx/configuration-dynamic.make
index fa9bd03..4e2dee5 100644
--- a/libcutl/build/cxx/configuration-dynamic.make
+++ b/libcutl/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)
diff --git a/libcutl/build/cxx/generic/configuration-dynamic.make b/libcutl/build/cxx/generic/configuration-dynamic.make
new file mode 100644
index 0000000..d1672cf
--- /dev/null
+++ b/libcutl/build/cxx/generic/configuration-dynamic.make
@@ -0,0 +1,5 @@
+ifneq ($(CXX),)
+cxx_generic := $(CXX)
+else
+cxx_generic := g++
+endif
diff --git a/libcutl/build/cxx/gnu/configuration-dynamic.make b/libcutl/build/cxx/gnu/configuration-dynamic.make
deleted file mode 100644
index b432d56..0000000
--- a/libcutl/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 :=