diff options
author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-07-12 03:23:54 +0200 |
---|---|---|
committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-07-12 03:23:54 +0200 |
commit | 0367815bab13f61cd0c309f0755c9619dc4e49b0 (patch) | |
tree | 1ad2a977b969c8067fa9991d72b105036842dc70 /tools/gmake_scripts/compiler_gcc.mk | |
parent | 324ab8a11adb6526a06333b3d11d7314ee48a4f8 (diff) | |
parent | 3e6c7accdc2f89908389df126f3fb7294eb9be45 (diff) | |
download | uGFX-0367815bab13f61cd0c309f0755c9619dc4e49b0.tar.gz uGFX-0367815bab13f61cd0c309f0755c9619dc4e49b0.tar.bz2 uGFX-0367815bab13f61cd0c309f0755c9619dc4e49b0.zip |
Merge branch 'master' into Alternate_Raw32_Scheduler
Conflicts:
src/gos/gos_raw32.c
Diffstat (limited to 'tools/gmake_scripts/compiler_gcc.mk')
-rw-r--r-- | tools/gmake_scripts/compiler_gcc.mk | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/tools/gmake_scripts/compiler_gcc.mk b/tools/gmake_scripts/compiler_gcc.mk index c6225d4d..23912992 100644 --- a/tools/gmake_scripts/compiler_gcc.mk +++ b/tools/gmake_scripts/compiler_gcc.mk @@ -196,22 +196,31 @@ builddirs: $(FAKEFILE): ifneq ($(OPT_VERBOSE_COMPILE),yes) - @echo . ifneq ($(filter %.cpp,$(SRC) $(SRC_NOTHUMB) $(SRC_THUMB)),) - @echo C++ Compiler Options.. $(XCXX) -c $(CPPFLAGS) $(CXXFLAGS) $(SRCFLAGS) $(@:.o=.cpp) -o $(OBJDIR)/$@ + @echo . + @echo C++ Compiler Options.. + @echo $(XCXX) -c $(CPPFLAGS) $(CXXFLAGS) $(SRCFLAGS) $(@:.o=.cpp) -o $(OBJDIR)/$@ else ifneq ($(filter %.c++,$(SRC) $(SRC_NOTHUMB) $(SRC_THUMB)),) - @echo C++ Compiler Options.. $(XCXX) -c $(CPPFLAGS) $(CXXFLAGS) $(SRCFLAGS) $(@:.o=.c++) -o $(OBJDIR)/$@ + @echo . + @echo C++ Compiler Options.. + @echo $(XCXX) -c $(CPPFLAGS) $(CXXFLAGS) $(SRCFLAGS) $(@:.o=.c++) -o $(OBJDIR)/$@ endif endif ifneq ($(filter %.c,$(SRC) $(SRC_NOTHUMB) $(SRC_THUMB)),) - @echo C Compiler Options.... $(XCC) -c $(CPPFLAGS) $(CFLAGS) $(SRCFLAGS) $(@:.o=.c) -o $(OBJDIR)/$@ + @echo . + @echo C Compiler Options.... + @echo $(XCC) -c $(CPPFLAGS) $(CFLAGS) $(SRCFLAGS) $(@:.o=.c) -o $(OBJDIR)/$@ endif ifneq ($(filter %.s,$(SRC) $(SRC_NOTHUMB) $(SRC_THUMB)),) - @echo Assembler Options..... $(XCC) -c $(CPPFLAGS) $(CFLAGS) $(SRCFLAGS) $(@:.o=.s) -o $(OBJDIR)/$@ + @echo . + @echo Assembler Options..... + @echo $(XCC) -c $(CPPFLAGS) $(CFLAGS) $(SRCFLAGS) $(@:.o=.s) -o $(OBJDIR)/$@ endif ifneq ($(OPT_MAKE_LIB),yes) - @echo Linker Options........ $(XLD) $(LDFLAGS) $(OBJDIR)/$@ -o $(EXEFILE) + @echo . + @echo Linker Options........ + @echo $(XLD) $(LDFLAGS) $(OBJDIR)/$@ -o $(EXEFILE) endif @echo . endif |