diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2014-07-14 09:13:55 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2014-07-14 09:13:55 +0200 |
| commit | 45905095475cea42602f71e94084c74b951ff18b (patch) | |
| tree | ccdaeb5e3f9d2765219fb1df7caf8e847f5a6258 | |
| parent | d0f8909087e541ca448901399db4f6c29dc3c4b7 (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.
| -rw-r--r-- | build/c/configuration.make | 10 | ||||
| -rw-r--r-- | build/cxx/configuration.make | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/build/c/configuration.make b/build/c/configuration.make index 53f427e..e47731c 100644 --- a/build/c/configuration.make +++ b/build/c/configuration.make @@ -30,11 +30,11 @@ $(out_root)/%: c_optimize := $(c_optimize) $(out_root)/%: c_debug := $(c_debug) $(out_root)/%: c_rpath := $(c_rpath) -$(out_root)/%: c_pp_extra_options := $(c_pp_extra_options) -$(out_root)/%: c_extra_options := $(c_extra_options) -$(out_root)/%: c_ld_extra_options := $(c_ld_extra_options) -$(out_root)/%: c_extra_libs := $(c_extra_libs) -$(out_root)/%: c_extra_lib_paths := $(c_extra_lib_paths) +$(out_root)/%: c_pp_extra_options := $(c_pp_extra_options) $(c_pp_cmd_options) +$(out_root)/%: c_extra_options := $(c_extra_options) $(c_cmd_options) +$(out_root)/%: c_ld_extra_options := $(c_ld_extra_options) $(c_ld_cmd_options) +$(out_root)/%: c_extra_libs := $(c_extra_libs) $(c_cmd_libs) +$(out_root)/%: c_extra_lib_paths := $(c_extra_lib_paths) $(c_cmd_lib_paths) else 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 |