diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-04-24 15:02:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-04-24 15:02:10 +1000 |
| commit | 3925988ec2bd5e7db55880255d5d70fb74255fdb (patch) | |
| tree | 121f4f5cf68537fdcbf0a2fee5f6b0b11fce7ef3 /Makefile | |
| parent | 104a007a1e60f4e23637e084b4815c4cda3423ce (diff) | |
| parent | 8e9540ec9e6e0f9951ea89a21930b805eb01fc0a (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
drivers/clocksource/Makefile
include/linux/clockchips.h
tools/Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1334,11 +1334,11 @@ kernelversion: # Clear a bunch of variables before executing the submake tools/: FORCE $(Q)mkdir -p $(objtree)/tools - $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/ + $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ tools/%: FORCE $(Q)mkdir -p $(objtree)/tools - $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/ $* + $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ $* # Single targets # --------------------------------------------------------------------------- |