Currently the RELEASE and DEBUG version CFLAGS and LDFLAGS are not being
honored.

This patch fixes that problem.

Index: Makefile.inc
===================================================================
--- Makefile.inc	(revision 1670)
+++ Makefile.inc	(working copy)
@@ -38,11 +38,9 @@
 # COROSYNC_BUILD can be defined as RELEASE or DEBUG
 #
 ifndef COROSYNC_BUILD
-	COROSYNC_BUILD=DEBUG
+	COROSYNC_BUILD=RELEASE
 endif
 
-# COROSYNC_PROFILE
-
 # default CFLAGS, LDFLAGS
 #
 CFLAGS =
@@ -58,31 +56,22 @@
 # build CFLAGS, LDFLAGS
 #
 ifeq (${COROSYNC_BUILD}, RELEASE) 
-	CFLAGS += -O3 -Wall
-# -Wstrict-aliasing=2 TODO sameday fix all of these
-ifndef COROSYNC_PROFILE
-	CFLAGS += -fomit-frame-pointer
+	override CFLAGS += -O3 -Wall
+	override LDFLAGS += 
 endif
-	LDFLAGS += 
-endif
 ifeq (${COROSYNC_BUILD}, DEBUG) 
-	CFLAGS += -O0 -g -Wall -DDEBUG --time
-	LDFLAGS += -g
+	override CFLAGS += -O0 -g -Wall
+	override LDFLAGS += -g
 	ifeq (${COROSYNC_COMPAT}, SOLARIS)
 		CFLAGS += -Werror -DTS_CLASS
 	endif
 endif
 ifeq (${COROSYNC_BUILD}, COVERAGE)
-	CFLAGS += -O0 -g -ftest-coverage -fprofile-arcs
-	LDFLAGS += -g -ftest-coverage -fprofile-arcs
+	override CFLAGS += -O0 -g -ftest-coverage -fprofile-arcs
+	override LDFLAGS += -g -ftest-coverage -fprofile-arcs
 	BUILD_DYNAMIC=0
 endif
 
-ifdef COROSYNC_PROFILE
-	CFLAGS += -pg
-	LDFLAGS += -pg
-endif
-
 # platform specific CFLAGS, LDFLAGS
 #
 ifeq (${COROSYNC_COMPAT}, LINUX) 
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais

Reply via email to