diff options
| author | wbx <wbx@openadk.org> | 2011-04-12 19:22:32 +0200 |
|---|---|---|
| committer | wbx <wbx@openadk.org> | 2011-04-12 19:22:32 +0200 |
| commit | 933e74c07231e815bbfd9ed90073308eaf253a00 (patch) | |
| tree | f1733a1feb58ecf8f2d51eb9585edd2ee23f648b /package/pcc-libs/patches/100-adk.patch | |
| parent | 0c8fa8e61a481d2d25c55e20c0ebd5176375e623 (diff) | |
| parent | 819692c26044aa5bb280a08fa017de9d55ca18b9 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/pcc-libs/patches/100-adk.patch')
| -rw-r--r-- | package/pcc-libs/patches/100-adk.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/package/pcc-libs/patches/100-adk.patch b/package/pcc-libs/patches/100-adk.patch new file mode 100644 index 000000000..a588900d9 --- /dev/null +++ b/package/pcc-libs/patches/100-adk.patch @@ -0,0 +1,12 @@ +diff -pur pcc-libs-1.0.0~/csu/linux/Makefile pcc-libs-1.0.0/csu/linux/Makefile +--- pcc-libs-1.0.0.orig/csu/linux/Makefile 2009-08-13 11:16:46.000000000 +0200 ++++ pcc-libs-1.0.0/csu/linux/Makefile 2011-04-07 20:36:10.068600370 +0200 +@@ -4,7 +4,7 @@ VERSION ?= 0.9.9 + PCCLIBDIR ?= /usr/local/lib/pcc/$(TARGET)/$(VERSION)/lib + SRCDIR ?= . + +-CFLAGS = -I$(SRCDIR)/$(MACH) -I$(SRCDIR) -Wall -Wstrict-prototypes -Wmissing-prototypes ++CFLAGS += -I$(SRCDIR)/$(MACH) -I$(SRCDIR) -Wall -Wstrict-prototypes -Wmissing-prototypes + + OBJS = crt0.o crt1.o gcrt1.o crti.o crtn.o crtbegin.o crtend.o + |