diff options
| author | Patrick Georgi <patrick@georgi-clan.de> | 2014-11-22 17:42:58 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2014-11-25 08:47:38 +0100 |
| commit | 3ce96bd49c571955c600aba74115fa37124e4e90 (patch) | |
| tree | 826feb2c6aa4b71dada78b2ef111808517aa6b0f /src/lib/Makefile.inc | |
| parent | c7e6cae0d6e086804264f3172e77ebce11bcf0bd (diff) | |
| download | coreboot-3ce96bd49c571955c600aba74115fa37124e4e90.tar.xz | |
build system: use a single variable name for compiler runtimes
We build with either gcc or clang, no need to keep both around
Change-Id: I9af2cc7636bdc791a68ba8ed6e7c5a81973c5dfd
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/7552
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/lib/Makefile.inc')
| -rw-r--r-- | src/lib/Makefile.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 55e0fa84a9..0727c9faa3 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -122,9 +122,9 @@ RMODULE_LDFLAGS_CLANG := -nostartfiles --emit-relocs -z defs -Bsymbolic -T$(RMO define rmodule_link $(strip $(1)): $(strip $(2)) $$(RMODULE_LDSCRIPT) $$(obj)/ldoptions $$(RMODTOOL) ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) - $$(LD_rmodules_$(4)) $$(RMODULE_LDFLAGS_CLANG) --defsym=__heap_size=$(strip $(3)) -o $$@ --start-group $(strip $(2)) $$(LIBCLANG_RT_FILE_NAME_rmodules_$(4)) --end-group + $$(LD_rmodules_$(4)) $$(RMODULE_LDFLAGS_CLANG) --defsym=__heap_size=$(strip $(3)) -o $$@ --start-group $(strip $(2)) $$(COMPILER_RT_rmodules_$(4)) --end-group else - $$(CC_rmodules_$(4)) $$(CFLAGS_rmodules_$(4)) $$(RMODULE_LDFLAGS) -Wl,--defsym=__heap_size=$(strip $(3)) -o $$@ -Wl,--start-group $(strip $(2)) $$(LIBGCC_FILE_NAME_rmodules_$(4)) -Wl,--end-group + $$(CC_rmodules_$(4)) $$(CFLAGS_rmodules_$(4)) $$(RMODULE_LDFLAGS) -Wl,--defsym=__heap_size=$(strip $(3)) -o $$@ -Wl,--start-group $(strip $(2)) $$(COMPILER_RT_rmodules_$(4)) -Wl,--end-group endif $$(NM_rmodules_$(4)) -n $$@ > $$(basename $$@).map |