diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
| commit | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (patch) | |
| tree | 6709ddd6071a9c238ba69233540bbcfe560c6a44 /Makefile.flags | |
| parent | 67758035a4fe040c6ac69b39d61bcd6bddd7b827 (diff) | |
| parent | 56a3b82e9692a25ef9c9269e88feac0d579ce8e8 (diff) | |
| download | busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.gz busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.bz2 busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.zip | |
Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge
Conflicts:
coreutils/ls.c
include/platform.h
libbb/bb_basename.c
Diffstat (limited to 'Makefile.flags')
| -rw-r--r-- | Makefile.flags | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.flags b/Makefile.flags index c7a805877..513b6ebb2 100644 --- a/Makefile.flags +++ b/Makefile.flags | |||
| @@ -58,14 +58,14 @@ CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 | |||
| 58 | #CFLAGS += $(call cc-option,-Wconversion,) | 58 | #CFLAGS += $(call cc-option,-Wconversion,) |
| 59 | 59 | ||
| 60 | ifneq ($(CONFIG_DEBUG),y) | 60 | ifneq ($(CONFIG_DEBUG),y) |
| 61 | CFLAGS += $(call cc-option,-Os,) | 61 | CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,)) |
| 62 | else | 62 | else |
| 63 | CFLAGS += $(call cc-option,-g,) | 63 | CFLAGS += $(call cc-option,-g,) |
| 64 | #CFLAGS += "-D_FORTIFY_SOURCE=2" | 64 | #CFLAGS += "-D_FORTIFY_SOURCE=2" |
| 65 | ifeq ($(CONFIG_DEBUG_PESSIMIZE),y) | 65 | ifeq ($(CONFIG_DEBUG_PESSIMIZE),y) |
| 66 | CFLAGS += $(call cc-option,-O0,) | 66 | CFLAGS += $(call cc-option,-O0,) |
| 67 | else | 67 | else |
| 68 | CFLAGS += $(call cc-option,-Os,) | 68 | CFLAGS += $(call cc-option,-Os,$(call cc-option,-O2,)) |
| 69 | endif | 69 | endif |
| 70 | endif | 70 | endif |
| 71 | 71 | ||