diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2021-07-08 20:46:11 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2021-07-08 20:47:30 -0400 |
| commit | 2e9b93dc5df5aff35a64c55493bc2d2d74b4aa0d (patch) | |
| tree | 612e9d9a70ed50088ee643b7ea3bc6e0edae1ae2 /tools | |
| parent | 2c984f3714067a38980dae51d1cb7d66d49f84f8 (diff) | |
build: Nuke the ASMFLAGS workaround for gcc 3.4.x
Change-Id: I0f21e9539d39afd54916fa8d84ce798eef474a2c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/make.inc | 2 | ||||
| -rw-r--r-- | tools/root.make | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/make.inc b/tools/make.inc index d03898b2e1..5521612f62 100644 --- a/tools/make.inc +++ b/tools/make.inc @@ -11,7 +11,7 @@ $(OBJDIR)/%.o: %.c $(OBJDIR)/%.o: %.S $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $<)$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ + $(call PRINTS,CC $<)$(CC) $(CFLAGS) -c $< -o $@ # The echo stuff last in the dep update shell magic is to prevent any compiler # errors/warnings to cause an error code to get returned and thus stop the diff --git a/tools/root.make b/tools/root.make index f1bd14b827..2a83a32292 100644 --- a/tools/root.make +++ b/tools/root.make @@ -16,7 +16,6 @@ INCLUDES = -I$(BUILDDIR) -I$(BUILDDIR)/lang $(TARGET_INC) CFLAGS = $(INCLUDES) $(DEFINES) $(GCCOPTS) PPCFLAGS = $(filter-out -g -Dmain=SDL_main,$(CFLAGS)) # cygwin sdl-config fix -ASMFLAGS = -D__ASSEMBLER__ # work around gcc 3.4.x bug with -std=gnu99, only meant for .S files CORE_LDOPTS = $(GLOBAL_LDOPTS) # linker ops specifically for core build TOOLS = $(TOOLSDIR)/rdf2binary $(TOOLSDIR)/convbdf \ @@ -436,7 +435,7 @@ $(BUILDDIR)/%.o: $(ROOTDIR)/%.c $(BUILDDIR)/%.o: $(ROOTDIR)/%.S $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ # generated definitions for use in .S files $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c @@ -451,7 +450,7 @@ $(BUILDDIR)/%_asmdefs.h: $(ROOTDIR)/%_asmdefs.c %.o: %.S $(SILENT)mkdir -p $(dir $@) - $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) $(ASMFLAGS) -c $< -o $@ + $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(CFLAGS) -c $< -o $@ Makefile: $(TOOLSDIR)/configure ifneq (reconf,$(MAKECMDGOALS)) |