aboutsummaryrefslogtreecommitdiff
path: root/build/cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-07-14 09:13:55 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-07-14 09:13:55 +0200
commit45905095475cea42602f71e94084c74b951ff18b (patch)
treeccdaeb5e3f9d2765219fb1df7caf8e847f5a6258 /build/cxx
parentd0f8909087e541ca448901399db4f6c29dc3c4b7 (diff)
Add support for specifying extra options on make command line
Using *_extra_*_options variables discards the values specified in the configuration makefiles. If we want to specify additional options we can now use a set of parallel variables in the form *_cmd_*_options.
Diffstat (limited to 'build/cxx')
-rw-r--r--build/cxx/configuration.make10
1 files changed, 5 insertions, 5 deletions
diff --git a/build/cxx/configuration.make b/build/cxx/configuration.make
index 4ced682..4529f62 100644
--- a/build/cxx/configuration.make
+++ b/build/cxx/configuration.make
@@ -31,11 +31,11 @@ $(out_root)/%: cxx_optimize := $(cxx_optimize)
$(out_root)/%: cxx_debug := $(cxx_debug)
$(out_root)/%: cxx_rpath := $(cxx_rpath)
-$(out_root)/%: cxx_pp_extra_options := $(cxx_pp_extra_options)
-$(out_root)/%: cxx_extra_options := $(cxx_extra_options)
-$(out_root)/%: cxx_ld_extra_options := $(cxx_ld_extra_options)
-$(out_root)/%: cxx_extra_libs := $(cxx_extra_libs)
-$(out_root)/%: cxx_extra_lib_paths := $(cxx_extra_lib_paths)
+$(out_root)/%: cxx_pp_extra_options := $(cxx_pp_extra_options) $(cxx_pp_cmd_options)
+$(out_root)/%: cxx_extra_options := $(cxx_extra_options) $(cxx_cmd_options)
+$(out_root)/%: cxx_ld_extra_options := $(cxx_ld_extra_options) $(cxx_ld_cmd_options)
+$(out_root)/%: cxx_extra_libs := $(cxx_extra_libs) $(cxx_cmd_libs)
+$(out_root)/%: cxx_extra_lib_paths := $(cxx_extra_lib_paths) $(cxx_cmd_lib_paths)
else