X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=mk%2Frte.sharelib.mk;h=de53558341f855540557164ab156b1b41e1daab4;hb=f1a519ad981c83df8c26182d2fe6e31e88a8a1b3;hp=df6c268dc9cba65219b80e7411260a44cd535a39;hpb=d223059e682b10e0e766273a958f057a4482d9fe;p=dpdk.git diff --git a/mk/rte.sharelib.mk b/mk/rte.sharelib.mk index df6c268dc9..de53558341 100644 --- a/mk/rte.sharelib.mk +++ b/mk/rte.sharelib.mk @@ -29,6 +29,8 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +include $(RTE_SDK)/mk/internal/rte.build-pre.mk + # VPATH contains at least SRCDIR VPATH += $(SRCDIR) @@ -45,7 +47,16 @@ sharelib: $(LIB_ONE) FORCE OBJS = $(wildcard $(RTE_OUTPUT)/build/lib/*.o) -O_TO_S = $(LD) $(LDFLAGS) -shared $(OBJS) -o $(RTE_OUTPUT)/lib/$(LIB_ONE) +ifeq ($(LINK_USING_CC),1) +# Override the definition of LD here, since we're linking with CC +LD := $(CC) $(CPU_CFLAGS) +O_TO_S = $(LD) $(call linkerprefix,$(CPU_LDFLAGS)) \ + -shared $(OBJS) -o $(RTE_OUTPUT)/lib/$(LIB_ONE) +else +O_TO_S = $(LD) $(CPU_LDFLAGS) \ + -shared $(OBJS) -o $(RTE_OUTPUT)/lib/$(LIB_ONE) +endif + O_TO_S_STR = $(subst ','\'',$(O_TO_S)) #'# fix syntax highlight O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)"," LD $(@)") O_TO_S_CMD = "cmd_$@ = $(O_TO_S_STR)"