Commit f4250248 authored by Christoffer Ackelman's avatar Christoffer Ackelman Committed by Claes Sjöfors

Fixed linking error on newer GCC versions.

parent 4bc344f1
ifndef link_rule_mk
link_rule_mk := 1
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o \
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(rt_msg_eobjs) $(pwr_eobj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
endif
ifndef link_rule_mk
link_rule_mk := 1
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o\
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(rt_msg_eobjs) $(pwr_eobj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
endif
ifndef link_rule_mk
link_rule_mk := 1
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_eobjs) \
$(pwr_eobj)/rt_io_user.o -lpwr_nmps\
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(rt_msg_eobjs) $(pwr_eobj)/rt_io_user.o -lpwr_nmps $(pwre_conf_libdir) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
endif
ifndef link_rule_mk
link_rule_mk := 1
link = $(ld) $(linkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_objs) \
$(pwr_obj)/rt_io_user.o \
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(rt_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(linkflags)
endif
ifndef link_rule_mk
link_rule_mk := 1
link = $(ld) $(linkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_objs) \
$(pwr_obj)/rt_io_user.o \
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(rt_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(linkflags)
endif
......@@ -2,14 +2,12 @@ ifndef link_rule_mk
link_rule_mk := 1
ifeq ($(export_type),exp)
link = $(ld) $(explinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_objs) $(rs_msg_objs)\
$(pwr_obj)/rt_io_user.o \
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(rt_msg_objs) $(rs_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(explinkflags)
else
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_objs) $(rs_msg_objs)\
$(pwr_obj)/rt_io_user.o \
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) \
$(rt_msg_objs) $(rs_msg_objs) $(pwr_obj)/rt_io_user.o $(pwre_conf_libdir) \
$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
endif
endif
ifndef link_rule_mk
link_rule_mk := 1
link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
$(export_obj) $(objects) $(rt_msg_objs) \
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
link = $(ld) $(domap) -o $(export_exe) $(export_obj) $(objects) $(rt_msg_objs) \
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib) $(elinkflags)
endif
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