Move FLAGS from BuildLinux() to Makefile.gnu

Author: SRombautsU

Makefile.gnu

@@ -7,9 +7,10 @@ AR = ar
 GTK3_INCLUDE = -I/usr/include/gtk-3.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/atk-1.0 -I/usr/include/harfbuzz
 GTK3_LIBRARIES = -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
 
-CXXFLAGS += -O2 -g -fpermissive -Wno-deprecated-declarations $(GTK3_INCLUDE) $(P4PLUGIN_INCLUDE)
-LDFLAGS += -g
-LIBRARIES = -lstdc++ -lrt $(GTK3_LIBRARIES)
+CFLAGS += -O3 -g -fPIC -fexceptions -fvisibility=hidden -DLINUX
+CXXFLAGS += $(CFLAGS) -fpermissive -Wno-deprecated-declarations $(GTK3_INCLUDE) $(P4PLUGIN_INCLUDE)
+LDFLAGS += -g -pthread
+LIBRARIES += -lstdc++ -lrt $(GTK3_LIBRARIES)
 PLATFORM = linux64
 
 COMMON_MODULES = $(COMMON_SRCS:.c=.o)
@@ -22,7 +23,7 @@ TESTSERVER_TARGET= Build/$(PLATFORM)/TestServer
 P4PLUGIN_MODULES = $(P4PLUGIN_SRCS:.c=.o)
 P4PLUGIN_MODULES := $(P4PLUGIN_MODULES:.cpp=.o)
 P4PLUGIN_TARGET = PerforcePlugin
-P4PLUGIN_LINK += $(LIBRARIES) -ldl -fPIC -no-pie
+P4PLUGIN_LINK += $(LIBRARIES) -ldl -no-pie
 
 default: all
 

build.pl

@@ -161,12 +161,6 @@ sub TestWin32
 
 sub BuildLinux ($)
 {
-	my $cflags = '-O3 -fPIC -fexceptions -fvisibility=hidden -DLINUX';
-	my $cxxflags = "$cflags -Wno-ctor-dtor-private";
-
-	$ENV{'CFLAGS'} = $cflags;
-	$ENV{'CXXFLAGS'} = $cxxflags;
-
 	system ('make', '-f', 'Makefile.gnu', 'clean');
 	system ('make', '-f', 'Makefile.gnu') && die ("Failed to build PerforcePlugin for linux64");
 }