diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -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 |
6 files changed, 19 insertions, 5 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 83837567edc6..34f7708686d5 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -13,6 +13,7 @@ export SRC_ROOT=@SRC_ROOT@ export BUILDDIR=@BUILDDIR@ export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@ +@x_AFLAGS@ export AFLAGS=@AFLAGS@ export ALIGNOF_DOUBLE=@ALIGNOF_DOUBLE@ export ALIGNOF_INT=@ALIGNOF_INT@ export ALIGNOF_LONG=@ALIGNOF_LONG@ diff --git a/configure.ac b/configure.ac index 0a1394fe92ce..b4a6853b958c 100644 --- a/configure.ac +++ b/configure.ac @@ -3398,8 +3398,17 @@ else fi AC_SUBST(ENABLE_SYMBOLS) -dnl Check for explicit C/CXX/OBJC/OBJCXX/LDFLAGS. We by default use the ones specified -dnl by our build system, but explicit override is possible. +# Check for explicit A/C/CXX/OBJC/OBJCXX/LDFLAGS. +# By default use the ones specified by our build system, +# but explicit override is possible. +AC_MSG_CHECKING(for explicit AFLAGS) +if test -n "$AFLAGS"; then + AC_MSG_RESULT([$AFLAGS]) + x_AFLAGS= +else + AC_MSG_RESULT(no) + x_AFLAGS=[\#] +fi AC_MSG_CHECKING(for explicit CFLAGS) if test -n "$CFLAGS"; then AC_MSG_RESULT([$CFLAGS]) @@ -3440,11 +3449,13 @@ else AC_MSG_RESULT(no) x_LDFLAGS=[\#] fi +AC_SUBST(AFLAGS) AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(OBJCFLAGS) AC_SUBST(OBJCXXFLAGS) AC_SUBST(LDFLAGS) +AC_SUBST(x_AFLAGS) AC_SUBST(x_CFLAGS) AC_SUBST(x_CXXFLAGS) AC_SUBST(x_OBJCFLAGS) 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 |