Commit 3d377863 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

make: Introduce ldflags-y variable

We need a custom flags to build 32bit varian of criu
on 64bit host system, lets pass @ldflags-y here for
that.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent b82a4415
...@@ -48,7 +48,7 @@ $(obj)/$(PIELDS): $(obj)/$(PIELDS).in ...@@ -48,7 +48,7 @@ $(obj)/$(PIELDS): $(obj)/$(PIELDS).in
$(obj)/%.built-in.bin.o: $(obj)/%.built-in.o $(obj)/$(PIELDS) $(obj)/%.built-in.bin.o: $(obj)/%.built-in.o $(obj)/$(PIELDS)
$(E) " GEN " $@ $(E) " GEN " $@
$(Q) $(LD) -T $(obj)/$(PIELDS) -o $@ $< $(Q) $(LD) $(ldflags-y) -T $(obj)/$(PIELDS) -o $@ $<
$(obj)/%.built-in.bin: $(obj)/%.built-in.bin.o $(obj)/%.built-in.bin: $(obj)/%.built-in.bin.o
$(E) " GEN " $@ $(E) " GEN " $@
......
...@@ -95,7 +95,7 @@ $(obj)/%.o: $(obj)/%.pb-c.c $(obj)/%.pb-c.h ...@@ -95,7 +95,7 @@ $(obj)/%.o: $(obj)/%.pb-c.c $(obj)/%.pb-c.h
$(obj)/built-in.o: $(addprefix $(obj)/,$(proto-obj-y)) $(obj)/built-in.o: $(addprefix $(obj)/,$(proto-obj-y))
$(E) " LINK " $@ $(E) " LINK " $@
$(Q) $(LD) -r -o $@ $^ $(Q) $(LD) $(ldflags-y) -r -o $@ $^
_all += $(obj)/built-in.o _all += $(obj)/built-in.o
......
...@@ -172,7 +172,7 @@ $(1)-all-objs += $(all-objs) ...@@ -172,7 +172,7 @@ $(1)-all-objs += $(all-objs)
$$(obj)/$(1).built-in.o: $$($(1)-all-objs) $$($(1)-libs-e) $(libs-e) $$(obj)/$(1).built-in.o: $$($(1)-all-objs) $$($(1)-libs-e) $(libs-e)
$$(E) " LINK " $$@ $$(E) " LINK " $$@
$$(Q) $$(LD) -r -o $$@ $$^ $$(Q) $$(LD) $$(ldflags-y) -r -o $$@ $$^
_all += $$(obj)/$(1).built-in.o _all += $$(obj)/$(1).built-in.o
cleanup-y += $$(obj)/$(1).built-in.o cleanup-y += $$(obj)/$(1).built-in.o
...@@ -193,7 +193,7 @@ ifeq ($(targets),) ...@@ -193,7 +193,7 @@ ifeq ($(targets),)
ifneq ($(all-objs),) ifneq ($(all-objs),)
$(obj)/built-in.o: $(all-objs) $(libs-e) $(obj)/built-in.o: $(all-objs) $(libs-e)
$(E) " LINK " $@ $(E) " LINK " $@
$(Q) $(LD) -r -o $@ $^ $(Q) $(LD) $(ldflags-y) -r -o $@ $^
_all += $(obj)/built-in.o _all += $(obj)/built-in.o
cleanup-y += $(obj)/built-in.o cleanup-y += $(obj)/built-in.o
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment