diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-07 18:02:06 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-08 11:27:48 +0200 |
| commit | 8c1c2472dfb87e28b63328cdb7a3198e2cae5164 (patch) | |
| tree | 068d8bf852906ed6f35e6a1cddc861865656b3a1 | |
| parent | a149454c79b62c4bf1c87db44138d27b4bcdab77 (diff) | |
gbuild: replace gb_LinkTarget_set_objcflags with add_objcflags
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Executable.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 10 | ||||
| -rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 1 |
5 files changed, 12 insertions, 2 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 3c9cd82e2831..94582a892c7f 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -342,6 +342,7 @@ $(eval $(foreach method,\ set_cflags \ add_cxxflags \ set_yaccflags \ + add_objcflags \ add_objcxxflags \ add_defs \ set_defs \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 2cb23fc90b6d..a89676edeed7 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -96,6 +96,7 @@ $(eval $(foreach method,\ set_cflags \ add_cxxflags \ set_cxxflags \ + add_objcflags \ add_objcxxflags \ set_objcflags \ set_objcxxflags \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 2c74d6e70d2b..31972654bb79 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -174,6 +174,7 @@ $(eval $(foreach method,\ add_cxxflags \ set_cxxflags \ add_objcxxflags \ + add_objcflags \ set_objcflags \ set_objcxxflags \ add_defs \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 7d126fd7f52a..59d69fce1d22 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -576,9 +576,15 @@ $$(call gb_Output_error,\ endef define gb_LinkTarget_set_objcflags -$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := $(2) +$$(call gb_Output_error,\ + gb_LinkTarget_set_objcflags: use gb_LinkTarget_add_objcflags instead.) + +endef + +define gb_LinkTarget_add_objcflags +$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS += $(2) ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS := $(2) +$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS += $(2) endif endef diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 9179958f1357..73152586c845 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -97,6 +97,7 @@ $(eval $(foreach method,\ set_cflags \ add_cxxflags \ set_cxxflags \ + add_objcflags \ add_objcxxflags \ set_objcxxflags \ add_defs \ |