Have RELEASE be empty when CONFIGURATION != 'release'

mono · Mar 8, 2018 · c06eb62 · c06eb62
1 parent 0fb02c8
commit c06eb62
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/sdks/builds/Makefile b/sdks/builds/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/sdks/paths.mk
 
 CONFIGURATION?=release
 
-RELEASE=$(if $(filter $(CONFIGURATION),release),true,false)
+RELEASE=$(if $(filter $(CONFIGURATION),release),1)
 
 CCACHE:=$(shell which ccache)
 

diff --git a/sdks/builds/android.mk b/sdks/builds/android.mk
@@ -30,13 +30,13 @@ _android_$(1)_AC_VARS= \
 	ac_cv_func_sched_setaffinity=no
 
 _android_$(1)_CFLAGS= \
-	$(if $(filter $(RELEASE),true),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
+	$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
 	-fstack-protector \
 	-DMONODROID=1 \
 	$$(android_$(1)_CFLAGS)
 
 _android_$(1)_CXXFLAGS= \
-	$(if $(filter $(RELEASE),true),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
+	$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
 	-fstack-protector \
 	-DMONODROID=1 \
 	$$(android_$(1)_CXXFLAGS)
@@ -169,11 +169,11 @@ _android_$(1)_RANLIB=ranlib
 _android_$(1)_STRIP=strip
 
 _android_$(1)_CFLAGS= \
-	$(if $(filter $(RELEASE),true),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
+	$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
 	$$(android_$(1)_CFLAGS)
 
 _android_$(1)_CXXFLAGS= \
-	$(if $(filter $(RELEASE),true),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
+	$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
 	$$(android_$(1)_CXXFLAGS)
 
 _android_$(1)_CONFIGURE_ENVIRONMENT= \
@@ -269,11 +269,11 @@ _android_$(1)_AC_VARS= \
 	ac_cv_search_dlopen=no
 
 _android_$(1)_CFLAGS= \
-	$(if $(filter $(RELEASE),true),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
+	$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
 	-DXAMARIN_PRODUCT_VERSION=0
 
 _android_$(1)_CXXFLAGS= \
-	$(if $(filter $(RELEASE),true),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
+	$(if $(RELEASE),-O2 -g,-O0 -ggdb3 -fno-omit-frame-pointer) \
 	-DXAMARIN_PRODUCT_VERSION=0
 
 _android_$(1)_CONFIGURE_ENVIRONMENT= \

diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk
@@ -12,14 +12,14 @@
 PLATFORM_BIN=$(XCODE_DIR)/Toolchains/XcodeDefault.xctoolchain/usr/bin
 
 ios_CFLAGS= \
-	$(if $(filter $(RELEASE),true),-O2,-O0 -ggdb3 -gdwarf-2)
+	$(if $(RELEASE),-O2,-O0 -ggdb3 -gdwarf-2)
 
 ios_CPPFLAGS= \
-	$(if $(filter $(RELEASE),true),-O2,-O0 -ggdb3 -gdwarf-2) \
+	$(if $(RELEASE),-O2,-O0 -ggdb3 -gdwarf-2) \
 	-DMONOTOUCH=1
 
 ios_CXXFLAGS= \
-	$(if $(filter $(RELEASE),true),-O2,-O0 -ggdb3 -gdwarf-2)
+	$(if $(RELEASE),-O2,-O0 -ggdb3 -gdwarf-2)
 
 ios_LDFLAGS=