From a3da3b696a48f72131428e72b773d0240e2243f0 Mon Sep 17 00:00:00 2001 From: Richard Howell Date: Sun, 15 Jun 2014 21:45:25 +0200 Subject: [PATCH] don't use LD variable for linker --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2e2e10acf5..95a230794e 100644 --- a/Makefile +++ b/Makefile @@ -388,10 +388,10 @@ endif CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -g -I. ifeq ($(CXX_BUILD), 1) - LD = $(CXX) + LINK = $(CXX) CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS else - LD = $(CC) + LINK = $(CC) ifneq ($(GNU90_BUILD), 1) ifneq ($(findstring icc,$(CC)),) CFLAGS += -std=c99 -D_GNU_SOURCE @@ -428,7 +428,7 @@ config.mk: configure qb/* retroarch: $(RARCH_OBJ) @$(if $(Q), $(shell echo echo LD $@),) - $(Q)$(LD) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS) + $(Q)$(LINK) -o $@ $(RARCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS) tools/retroarch-joyconfig: $(RARCH_JOYCONFIG_OBJ) @$(if $(Q), $(shell echo echo LD $@),) @@ -440,7 +440,7 @@ endif tools/retrolaunch/retrolaunch: $(RARCH_RETROLAUNCH_OBJ) @$(if $(Q), $(shell echo echo LD $@),) - $(Q)$(LD) -o $@ $(RARCH_RETROLAUNCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS) + $(Q)$(LINK) -o $@ $(RARCH_RETROLAUNCH_OBJ) $(LIBS) $(LDFLAGS) $(LIBRARY_DIRS) $(OBJDIR)/%.o: %.c config.h config.mk @mkdir -p $(dir $@)