summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_gcc.patch
blob: e5a5a9699d31ed6a1704ae68842f75e761f073c2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
Date: 2022-05-24
Version: 11.21
Message: Parameterize the C++ compiler invocation, and use g++-12
Author: bgstack15
diff -aur 11.2-1/FreeFileSync/Source/Makefile 11.2-2/FreeFileSync/Source/Makefile
--- 11.2-1/FreeFileSync/Source/Makefile	2020-10-02 14:59:35.816639878 -0400
+++ 11.2-2/FreeFileSync/Source/Makefile	2020-10-02 14:59:54.220866929 -0400
@@ -1,4 +1,5 @@
 exeName = FreeFileSync
+CXX=g++-12
 
 cxxFlags += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
@@ -115,11 +116,11 @@
 
 ../Build/Bin/$(exeName): $(objFiles)
 	mkdir -p $(dir $@)
-	g++ -o $@ $^ $(linkFlags)
+	$(CXX) -o $@ $^ $(linkFlags)
 
 $(tmpPath)/ffs/src/%.o : %
 	mkdir -p $(dir $@)
-	g++ $(cxxFlags) -c $< -o $@
+	$(CXX) $(cxxFlags) -c $< -o $@
 
 clean:
 	rm -rf $(tmpPath)
diff -aur 11.2-1/FreeFileSync/Source/RealTimeSync/Makefile 11.2-2/FreeFileSync/Source/RealTimeSync/Makefile
--- 11.2-1/FreeFileSync/Source/RealTimeSync/Makefile	2020-10-02 14:59:35.820639928 -0400
+++ 11.2-2/FreeFileSync/Source/RealTimeSync/Makefile	2020-10-02 14:59:54.220866929 -0400
@@ -1,4 +1,5 @@
 exeName = RealTimeSync
+CXX=g++-12
 
 cxxFlags += -std=c++2b -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
            -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
@@ -54,11 +55,11 @@
 
 ../../Build/Bin/$(exeName): $(objFiles)
 	mkdir -p $(dir $@)
-	g++ -o $@ $^ $(linkFlags)
+	$(CXX) -o $@ $^ $(linkFlags)
 
 $(tmpPath)/ffs/src/rts/%.o : %
 	mkdir -p $(dir $@)
-	g++ $(cxxFlags) -c $< -o $@
+	$(CXX) $(cxxFlags) -c $< -o $@
 
 clean:
 	rm -rf $(tmpPath)

bgstack15