From 300d3ede816883ad5d29cd90085d9fe35ef6acba Mon Sep 17 00:00:00 2001
From: Wenkai Du <wenkai.du@amd.com>
Date: Thu, 17 Sep 2020 14:54:12 -0700
Subject: [PATCH] Prioritize NCCL_HOME

[ROCm/rccl-tests commit: 0d1940e18eafa337f558b9d6410399eb3d97f96d]
---
 projects/rccl-tests/src/Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/projects/rccl-tests/src/Makefile b/projects/rccl-tests/src/Makefile
index 5b7ffa965c..260e98a282 100644
--- a/projects/rccl-tests/src/Makefile
+++ b/projects/rccl-tests/src/Makefile
@@ -14,13 +14,19 @@ DEBUG ?= 0
 HIPCC = $(ROCM_HOME)/hip/bin/hipcc
 CXX = $(HIPCC)
 
-
 HIPCUFLAGS := -std=c++14
+LDFLAGS    :=
+HIPLDFLAGS :=
+
+ifneq ($(NCCL_HOME), "")
+HIPCUFLAGS += -I$(NCCL_HOME)
+HIPLDFLAGS   += -Wl,-rpath,$(NCCL_HOME) -L$(NCCL_HOME)
+endif
 HIPCUFLAGS += -I$(ROCM_HOME)/include
 HIPCUFLAGS += -I$(ROCM_HOME)/include/rccl
 HIPCUFLAGS += -I$(ROCM_HOME)/hip/include/hip
-LDFLAGS    := -L$(ROCM_HOME)/lib -lhsa-runtime64 -lrt
-HIPLDFLAGS := $(CUSTOM_RCCL_LIB) -L$(ROCM_HOME)/lib -lhsa-runtime64 -lrt
+LDFLAGS    += -L$(ROCM_HOME)/lib -lhsa-runtime64 -lrt
+HIPLDFLAGS += $(CUSTOM_RCCL_LIB) -L$(ROCM_HOME)/lib -lhsa-runtime64 -lrt
 
 ifeq ($(DEBUG), 0)
 HIPCUFLAGS += -O3
@@ -35,10 +41,6 @@ endif
 .PHONY: build clean
 
 BUILDDIR ?= ../build
-ifneq ($(NCCL_HOME), "")
-HIPCUFLAGS += -I$(NCCL_HOME)/include/
-HIPLDFLAGS   += -Wl,-rpath,$(NCCL_HOME)/lib -L$(NCCL_HOME)/lib
-endif
 
 ifeq ($(MPI), 1)
 HIPCUFLAGS += -DMPI_SUPPORT -I${MPI_HOME}/include -I${MPI_HOME}/include/mpi