diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-12-21 17:27:39 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-12-21 17:29:44 +0100 |
| commit | debd56b20ec505b57e70b6fd811539a36e3d5b93 (patch) | |
| tree | f27bd74b6fd90bb230c3ef4d27b7cd4f65b43f33 /solenv | |
| parent | fdo#57545 remove redundant capitalType functions (diff) | |
| download | core-debd56b20ec505b57e70b6fd811539a36e3d5b93.tar.gz core-debd56b20ec505b57e70b6fd811539a36e3d5b93.zip | |
gbuild: AsmObject: support user defined AFLAGS
There does not seem to be a point to using CFLAGS here, usual convention
appears to be to use AFLAGS. Not target local, since right now there is
no need for that.
Change-Id: I5d2f45777c226c0afc632adc21e446f09740d75d
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index b3b5830346d2..f88f0f17d6f9 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -44,7 +44,7 @@ $(call gb_Output_announce,$(2),$(true),ASM,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \ $(gb_CC) \ - $(T_CFLAGS) \ + $(gb_AFLAGS) \ -c $(3) \ -o $(1)) \ $(INCLUDE) && \ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 8709c3684b9c..b8b7da3fbea2 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -54,6 +54,8 @@ gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+ gb_CPPU_ENV := gcc3 +gb_AFLAGS := $(AFLAGS) + gb_COMPILERDEFS := \ -D$(COM) \ -DCPPU_ENV=$(gb_CPPU_ENV) \ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index cbd39d05f48d..2f9393700ffa 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -149,7 +149,7 @@ define gb_AsmObject__command $(call gb_Output_announce,$(2),$(true),ASM,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ - "$(ML_EXE)" $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \ + "$(ML_EXE)" /c /Cp $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \ echo "$(1) : $(3)" > $(4) endef diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index bea9b91db844..1e9ac46eec13 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -67,7 +67,7 @@ gb_RCDEFS := \ gb_RCFLAGS := \ -V -gb_AFLAGS := /c /Cp +gb_AFLAGS := $(AFLAGS) # Do we really need to disable to many warnings? It seems to me that # many of these warnings are for custructs that we have been actively |