database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-30 07:25:34 +03:00
Code Activity

Merge Commit

Browse Source
This commit is contained in:
David Hall
2016-02-13 14:58:24 -06:00
parent 3b730e08f8 38055a188e
commit 35b7c74e77
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rules.mak
View File

@@ -60,8 +60,8 @@ ifeq (4.5,$(shell test -x /usr/local/gcc45/bin/gcc && /usr/local/gcc45/bin/gcc -
endif endif
#Use only the last, non-comment line from MyDebugFlags file #Use only the last, non-comment line from MyDebugFlags file
LOCAL_DEBUG_FLAGS=$(shell test -f $(TOP)/MyDebugFlags && awk '/^[^\#]/ {last=$$0}END{print last}' $(TOP)/MyDebugFlags) #LOCAL_DEBUG_FLAGS=$(shell test -f $(TOP)/MyDebugFlags && awk '/^[^\#]/ {last=$$0}END{print last}' $(TOP)/MyDebugFlags)
ifneq (,$(LOCAL_DEBUG_FLAGS)) #ifneq (,$(LOCAL_DEBUG_FLAGS))
DEBUG_FLAGS=$(LOCAL_DEBUG_FLAGS) # DEBUG_FLAGS=$(LOCAL_DEBUG_FLAGS)
endif #endif

8
rules.mak.debug
View File

@@ -60,8 +60,8 @@ ifeq (4.5,$(shell test -x /usr/local/gcc45/bin/gcc && /usr/local/gcc45/bin/gcc -
endif endif
#Use only the last, non-comment line from MyDebugFlags file #Use only the last, non-comment line from MyDebugFlags file
LOCAL_DEBUG_FLAGS=$(shell test -f $(TOP)/MyDebugFlags && awk '/^[^\#]/ {last=$$0}END{print last}' $(TOP)/MyDebugFlags) #LOCAL_DEBUG_FLAGS=$(shell test -f $(TOP)/MyDebugFlags && awk '/^[^\#]/ {last=$$0}END{print last}' $(TOP)/MyDebugFlags)
ifneq (,$(LOCAL_DEBUG_FLAGS)) #ifneq (,$(LOCAL_DEBUG_FLAGS))
DEBUG_FLAGS=$(LOCAL_DEBUG_FLAGS) # DEBUG_FLAGS=$(LOCAL_DEBUG_FLAGS)
endif #endif

8
rules.mak.release
View File

@@ -60,8 +60,8 @@ ifeq (4.5,$(shell test -x /usr/local/gcc45/bin/gcc && /usr/local/gcc45/bin/gcc -
endif endif
#Use only the last, non-comment line from MyDebugFlags file #Use only the last, non-comment line from MyDebugFlags file
LOCAL_DEBUG_FLAGS=$(shell test -f $(TOP)/MyDebugFlags && awk '/^[^\#]/ {last=$$0}END{print last}' $(TOP)/MyDebugFlags) #LOCAL_DEBUG_FLAGS=$(shell test -f $(TOP)/MyDebugFlags && awk '/^[^\#]/ {last=$$0}END{print last}' $(TOP)/MyDebugFlags)
ifneq (,$(LOCAL_DEBUG_FLAGS)) #ifneq (,$(LOCAL_DEBUG_FLAGS))
DEBUG_FLAGS=$(LOCAL_DEBUG_FLAGS) # DEBUG_FLAGS=$(LOCAL_DEBUG_FLAGS)
endif #endif