diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
| commit | 71bfe47f023c55c322607939b786ce0a44627dfc (patch) | |
| tree | f59c37feb00f1df2e0f4ec282ae9c80ad6bb0cdc /scripts/Kbuild.include | |
| parent | 73c1ac1e3b6c989b9b5f7b2313ac590a1c3b6d6a (diff) | |
| parent | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'scripts/Kbuild.include')
| -rw-r--r-- | scripts/Kbuild.include | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index f01132263535..bb19c1561f1e 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include | |||
| @@ -77,8 +77,7 @@ cc-option-align = $(subst -functions=0,,\ | |||
| 77 | 77 | ||
| 78 | # cc-version | 78 | # cc-version |
| 79 | # Usage gcc-ver := $(call cc-version, $(CC)) | 79 | # Usage gcc-ver := $(call cc-version, $(CC)) |
| 80 | cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh \ | 80 | cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC)) |
| 81 | $(if $(1), $(1), $(CC))) | ||
| 82 | 81 | ||
| 83 | # cc-ifversion | 82 | # cc-ifversion |
| 84 | # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) | 83 | # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1) |