diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-05 14:12:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-05 14:12:37 -0400 |
| commit | 1a2728ae4faf12874173de156b8a7e66cfbbeae5 (patch) | |
| tree | 9aba8e6c915b341df8ec6077d8ecb28f1eb32b0b /scripts | |
| parent | dcc7dbc73169bb4e39f27c1d95bbf031ccfc1744 (diff) | |
| parent | 12c7510f17ff29190e52336910e43a50c0d620a6 (diff) | |
| download | u-boot-1a2728ae4faf12874173de156b8a7e66cfbbeae5.tar.gz u-boot-1a2728ae4faf12874173de156b8a7e66cfbbeae5.tar.xz u-boot-1a2728ae4faf12874173de156b8a7e66cfbbeae5.zip | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 84915d7e51..1c949fc0eb 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -104,8 +104,9 @@ modname_flags = $(if $(filter 1,$(words $(modname))),\ orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ $(ccflags-y) $(CFLAGS_$(basetarget).o) _c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) -_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ +orig_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ $(asflags-y) $(AFLAGS_$(basetarget).o) +_a_flags = $(filter-out $(AFLAGS_REMOVE_$(basetarget).o), $(orig_a_flags)) _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) # |