fix review comments
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/e2e6f9fb Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/e2e6f9fb Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/e2e6f9fb Branch: refs/heads/master Commit: e2e6f9fbac488db09ba3007b21d8ed9b00550acd Parents: d2b365c Author: LiuMing <[email protected]> Authored: Wed May 9 13:38:15 2018 +0800 Committer: LiuMing <[email protected]> Committed: Wed May 9 13:38:15 2018 +0800 ---------------------------------------------------------------------- core/sqf/macros.gmk | 1 + core/sqf/src/seabed/src/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/e2e6f9fb/core/sqf/macros.gmk ---------------------------------------------------------------------- diff --git a/core/sqf/macros.gmk b/core/sqf/macros.gmk index 1b6a9a8..00e7ced 100644 --- a/core/sqf/macros.gmk +++ b/core/sqf/macros.gmk @@ -146,4 +146,5 @@ GCC_FULL_VERSION := $(shell gcc -dumpversion) GCC_MAJOR_VERSION := $(shell echo $(GCC_FULL_VERSION) | cut -d. -f 1) GCC_MINOR_VERSION := $(shell echo $(GCC_FULL_VERSION) | cut -d. -f 2) GCC_MAJOR_VERSION_GT_3 := $(shell expr $(GCC_MAJOR_VERSION) \> 3) +GCC_MAJOR_VERSION_EQ_4 := $(shell expr $(GCC_MAJOR_VERSION) \= 4) GCC_MINOR_VERSION_GT_4 := $(shell expr $(GCC_MINOR_VERSION) \> 4) http://git-wip-us.apache.org/repos/asf/trafodion/blob/e2e6f9fb/core/sqf/src/seabed/src/Makefile ---------------------------------------------------------------------- diff --git a/core/sqf/src/seabed/src/Makefile b/core/sqf/src/seabed/src/Makefile index 0c9bdd1..186949c 100644 --- a/core/sqf/src/seabed/src/Makefile +++ b/core/sqf/src/seabed/src/Makefile @@ -59,7 +59,7 @@ LIBSX += -lrt # the order of these objects have to be swapped based on the GCC version MS_MPITMSG_O = $(OUTDIR)/mpitmsg.o \ $(OUTDIR)/ms.o -ifeq ($(GCC_MAJOR_VERSION_GT_3),1) +ifeq ($(GCC_MAJOR_VERSION_EQ_4),1) ifeq ($(GCC_MINOR_VERSION_GT_4),1) MS_MPITMSG_O = $(OUTDIR)/ms.o \ $(OUTDIR)/mpitmsg.o
