瀏覽代碼

Using a separate linker was a mistake

Streetwalrus Einstein 10 年之前
父節點
當前提交
e36c06237e
共有 1 個文件被更改,包括 2 次插入3 次删除
  1. 2 3
      Makefile

+ 2 - 3
Makefile

@@ -16,8 +16,7 @@ CFLAGS = $(CFLAGS_COMMON) -std=gnu11
 CPP = nspire-g++
 CPP = nspire-g++
 CPPFLAGS = $(CFLAGS_COMMON) -std=gnu++98
 CPPFLAGS = $(CFLAGS_COMMON) -std=gnu++98
 
 
-LD = arm-none-eabi-ld.gold
-LDFLAGS =
+LDFLAGS = $(CFLAGS_COMMON)
 
 
 ZEHN = genzehn
 ZEHN = genzehn
 ZEHNFLAGS = --name "$(NAME)"
 ZEHNFLAGS = --name "$(NAME)"
@@ -50,7 +49,7 @@ art/sprites.c:
 $(ELF): $(OBJS)
 $(ELF): $(OBJS)
 	@mkdir -p $(DISTDIR)
 	@mkdir -p $(DISTDIR)
 	@echo "CC: $@"
 	@echo "CC: $@"
-	@+$(LD) $^ -o $(ELF) $(LDFLAGS)
+	@+$(CC) $(LDFLAGS) $^ -o $(ELF)
 
 
 $(EXE): $(ELF)
 $(EXE): $(ELF)
 	@mkdir -p $(DISTDIR)
 	@mkdir -p $(DISTDIR)