Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fix for whiny clang

commit fe6633247769b636e496ab2e372417297c5e039c 1 parent b0d35b9
comex authored

Showing 1 changed file with 8 additions and 5 deletions. Show diff stats Hide diff stats

  1. +8 5 Makefile.common
13 Makefile.common
@@ -7,7 +7,8 @@ DYLIB = so
7 7 else
8 8 DYNAMICLIB = -dynamiclib -ldylib1.o
9 9 DYLIB = dylib
10   -override CFLAGS += -DIMG3_SUPPORT -dead_strip
  10 +override CFLAGS += -DIMG3_SUPPORT
  11 +override LDFLAGS += -dead_strip
11 12 endif
12 13 override CFLAGS := -Os -Wall -Wextra -Wno-parentheses -Wreturn-type $(CFLAGS)
13 14 ifneq "$(NDEBUG)" "1"
@@ -32,7 +33,8 @@ GXX ?= $(GXX_$(BUILD))
32 33
33 34 override CXXFLAGS += $(CFLAGS) -std=gnu++0x -Werror -Wno-pointer-arith
34 35 ifneq "$(GXX)" ""
35   -override GXX := $(GXX) $(CXXFLAGS)
  36 +override GXXO := $(GXX) $(CXXFLAGS)
  37 +override GXX := $(GXXO) $(LDFLAGS)
36 38 endif
37 39
38 40 # C
@@ -45,7 +47,8 @@ else
45 47 override CFLAGS += -std=gnu99 -Werror -Wimplicit -Wno-multichar
46 48 endif
47 49
48   -override GCC := $(GCC) $(CFLAGS)
  50 +override GCCO := $(GCC) $(CFLAGS)
  51 +override GCC := $(GCCO) $(LDFLAGS)
49 52
50 53 AR ?= ar
51 54 ifneq "$(filter $(BUILD),armv6 armv7 arm_universal)" ""
@@ -56,10 +59,10 @@ LDID =
56 59 endif
57 60
58 61 $(OUTDIR)/%.o: %.c *.h $(dir %)/*.h $(EXTRA_DEPS)
59   - $(GCC) -c -o $@ $<
  62 + $(GCCO) -c -o $@ $<
60 63
61 64 $(OUTDIR)/%.o: %.cpp *.h $(dir %)/*.h $(EXTRA_DEPS)
62   - $(GXX) -c -o $@ $<
  65 + $(GXXO) -c -o $@ $<
63 66
64 67 .clean:
65 68 rm -rf native universal armv6 armv7 arm_universal mp

0 comments on commit fe66332

Please sign in to comment.
Something went wrong with that request. Please try again.