From 7c341a6abf7381747355c34167e376ab322916f1 Mon Sep 17 00:00:00 2001
From: Daniel Barry <dbarry@vols.utk.edu>
Date: Wed, 11 Dec 2024 19:30:46 +0000
Subject: [PATCH] intel_gpu: remove unnecessary linker flags

Since the flag -lstdc++ is already included from the configure
script, it does not need to be included in the component's Rules
and Makefiles.

These changes have been tested on the Intel Max 1550 GPU.
---
 src/components/intel_gpu/Rules.intel_gpu | 2 +-
 src/components/intel_gpu/tests/Makefile  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/intel_gpu/Rules.intel_gpu b/src/components/intel_gpu/Rules.intel_gpu
index d5262981a..6866707c4 100644
--- a/src/components/intel_gpu/Rules.intel_gpu
+++ b/src/components/intel_gpu/Rules.intel_gpu
@@ -15,7 +15,7 @@ GPUOBJS = GPUMetricInterface.o GPUMetricHandler.o linux_intel_gpu_metrics.o
 COMPOBJS += $(GPUOBJS)
 
 CFLAGS += $(LDL) -g -DDEBUG  -I$(GPU_INTERNAL) -I$(GPU_INTERNAL)/inc -D_GLIBCXX_USE_CXX11_ABI=1
-LDFLAGS += -g -lstdc++ -ldl
+LDFLAGS += -g -ldl
 
 GPUMetricInterface.o:  $(GPU_INTERNAL)/src/GPUMetricInterface.cpp $(GPUHEADER)
 	$(CXX) -g -fpic $(CFLAGS) $(CPPFLAGS) -I$(GPU_INTERNAL)/inc -I$(INTEL_L0_HEADERS) -o GPUMetricInterface.o -c $(GPU_INTERNAL)/src/GPUMetricInterface.cpp
diff --git a/src/components/intel_gpu/tests/Makefile b/src/components/intel_gpu/tests/Makefile
index a79a77936..2ffef709f 100644
--- a/src/components/intel_gpu/tests/Makefile
+++ b/src/components/intel_gpu/tests/Makefile
@@ -4,7 +4,7 @@ CFLAGS += -DDEBUG  -I../../../testlib
 
 INTEL_L0_HEADERS ?=/usr/include
 INTEL_L0_LIB64 ?=/usr/lib
-CPPLDFLAGS+=-lstdc++ -ldl
+CPPLDFLAGS+=-ldl
 GPULIB=-L$(INTEL_L0_LIB64) -lze_loader
 
 %.o:%.c