From 161c8414026470cc239a5f0dd4f4a23010855567 Mon Sep 17 00:00:00 2001 From: Tao Sang Date: Fri, 17 Apr 2020 10:13:08 -0500 Subject: [PATCH] Revert "Solve issues with hip-vdi runtime static lib" This reverts commit 0ab2c685bd99f38a33c7941b274618e6f2062e1b. Reason for revert: It is causing dkms-no-npi-hipclang broken. It is top priority to maintain dkms-no-npi-hipclang build, otherwise we lose track of regression analysis. So revert the change for now and recommit it after fixing it. Change-Id: Ia5136e888baecb6148c6c18eedbf37066fcb1eaa [ROCm/hip-tests commit: af5a4ca38b340faa819dee11e94b31c8f32440ec] --- projects/hip-tests/samples/0_Intro/bit_extract/Makefile | 7 +------ projects/hip-tests/samples/0_Intro/square/Makefile | 7 ++----- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/projects/hip-tests/samples/0_Intro/bit_extract/Makefile b/projects/hip-tests/samples/0_Intro/bit_extract/Makefile index 4a3a0bb4fe..08bca6e642 100644 --- a/projects/hip-tests/samples/0_Intro/bit_extract/Makefile +++ b/projects/hip-tests/samples/0_Intro/bit_extract/Makefile @@ -13,15 +13,10 @@ ifeq (${HIP_PLATFORM}, nvcc) endif EXE=bit_extract -EXE_STATIC=bit_extract_static $(EXE): bit_extract.cpp $(HIPCC) $(HIPCC_FLAGS) $< -o $@ -$(EXE_STATIC): bit_extract.cpp - $(HIPCC) -use-staticlib $(HIPCC_FLAGS) $< -o $@ - -all: $(EXE) $(EXE_STATIC) clean: - rm -f *.o $(EXE) $(EXE_STATIC) + rm -f *.o $(EXE) diff --git a/projects/hip-tests/samples/0_Intro/square/Makefile b/projects/hip-tests/samples/0_Intro/square/Makefile index aa046eeaaa..9bb0dd8205 100644 --- a/projects/hip-tests/samples/0_Intro/square/Makefile +++ b/projects/hip-tests/samples/0_Intro/square/Makefile @@ -11,7 +11,7 @@ else SOURCES=square.cpp endif -all: square.out square.out.static +all: square.out # Step square.cpp: square.cu @@ -20,8 +20,5 @@ square.cpp: square.cu square.out: $(SOURCES) $(HIPCC) $(CXXFLAGS) $(SOURCES) -o $@ -square.out.static: $(SOURCES) - $(HIPCC) -use-staticlib $(CXXFLAGS) $(SOURCES) -o $@ - clean: - rm -f *.o *.out *.out.static square.cpp + rm -f *.o *.out square.cpp