diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-23 15:25:44 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-23 15:25:44 +0200 |
commit | 8286ac511144e4f17d34eac9affb97e50646344a (patch) | |
tree | f1af7320d7b6be6be059216d0ad08ac7b4f73fd0 /build-0.3/cxx/configuration.make | |
parent | a15cf65c44d5c224169c32ef5495b68c758134b7 (diff) |
Imported Upstream version 4.0.0upstream/4.0.0
Diffstat (limited to 'build-0.3/cxx/configuration.make')
-rw-r--r-- | build-0.3/cxx/configuration.make | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/build-0.3/cxx/configuration.make b/build-0.3/cxx/configuration.make index 5ad97ae..4529f62 100644 --- a/build-0.3/cxx/configuration.make +++ b/build-0.3/cxx/configuration.make @@ -1,6 +1,5 @@ # file : build/cxx/configuration.make -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2004-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2004-2012 Code Synthesis Tools CC # license : GNU GPL v2; see accompanying LICENSE file $(call include-once,$(bld_root)/cxx/configuration-rules.make,$(dcf_root)) @@ -32,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 |