Revert "Solve issues with hip-vdi runtime static lib"

This reverts commit ed3b0eb391.

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

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)

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