* Make -DNDEBUG depend on DOASSERTS, not DODEBUG

* Make -msoft-float depend on USE_GCC_SOFT_FLOAT_OPTION, not
  UCLIBC_HAS_SOFT_FLOAT.

1 files changed, 4 insertions, 2 deletions

diff --git a/Rules.mak b/Rules.mak
index ffd4d3ce6..a388fb729 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -153,9 +153,11 @@ ifeq ($(strip $(DODEBUG)),y)
     LDFLAGS:= -shared --warn-common --warn-once -z combreloc
     STRIPTOOL:= true -Since_we_are_debugging
 else
-    CFLAGS  += -DNDEBUG #-fomit-frame-pointer
     LDFLAGS := -s -shared --warn-common --warn-once -z combreloc
 endif
+ifneq ($(strip $(DOASSERTS)),y)
+    CFLAGS += -DNDEBUG
+endif
 
 ifeq ($(strip $(HAVE_SHARED)),y)
     LIBRARY_CACHE:=#-DUSE_CACHE
@@ -172,7 +174,7 @@ endif
 ifeq ($(strip $(DOPIC)),y)
     CFLAGS += -fPIC
 endif
-ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+ifeq ($(strip $(USE_GCC_SOFT_FLOAT_OPTION)),y)
     CFLAGS += -msoft-float
 endif