diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-12-04 00:21:55 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-04 00:21:55 -0800 |
| commit | 0b402f74a04ff7f09193c5c88cdf860498b93b5c (patch) | |
| tree | 20511a1c18d0c77e926af4415b15f1a7152a5b5e /scripts | |
| parent | 8a475d4ba16373d30f8a57f8e2ee8f997dd00fbb (diff) | |
| parent | 0a858409d5cd7283b8720d989bd2dba3f9353a6c (diff) | |
Merge "Merge android-4.4.165 (f34ff9e) into msm-4.4"
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Kbuild.include | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 52aa80135426..92d68c355fd7 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -161,12 +161,13 @@ cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4)) # cc-ldoption # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both) cc-ldoption = $(call try-run,\ - $(CC) $(1) -nostdlib -x c /dev/null -o "$$TMP",$(1),$(2)) + $(CC) $(1) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -nostdlib -x c /dev/null -o "$$TMP",$(1),$(2)) # ld-option # Usage: LDFLAGS += $(call ld-option, -X) ld-option = $(call try-run,\ - $(CC) -x c /dev/null -c -o "$$TMPO" ; $(LD) $(1) "$$TMPO" -o "$$TMP",$(1),$(2)) + $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -x c /dev/null -c -o "$$TMPO"; \ + $(LD) $(LDFLAGS) $(1) "$$TMPO" -o "$$TMP",$(1),$(2)) # ar-option # Usage: KBUILD_ARFLAGS := $(call ar-option,D) |