summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--config.h.in3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e6eb8585b0..54db43db10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-27  Joseph Myers  <joseph@codesourcery.com>
+
+	* config.h.in [IS_IN_build]: Allow compiling without optimization.
+
 2012-04-27  Ryan S. Arnold  <rsa@linux.vnet.ibm.com>
 
 	[BZ #887]
diff --git a/config.h.in b/config.h.in
index 3b938f8013..81704a1ff6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,5 @@
-#if !defined __ASSEMBLER__ && !defined _ISOMAC && !defined __OPTIMIZE__
+#if !defined IS_IN_build && !defined __ASSEMBLER__ && !defined _ISOMAC \
+    && !defined __OPTIMIZE__
 # error "glibc cannot be compiled without optimization"
 #endif