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
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
Remove the hardcoded -L/usr/lib and -L/usr/lib64
This is not needed, and will cause issues:
https://github.com/gentoo/gentoo/pull/25825#issuecomment-1179497476
Index: premake-core-5.0.0-beta2/modules/d/tools/dmd.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/modules/d/tools/dmd.lua
+++ premake-core-5.0.0-beta2/modules/d/tools/dmd.lua
@@ -52,8 +52,8 @@
tdmd.gcc.libraryDirectories = {
architecture = {
- x86 = "-L-L/usr/lib",
- x86_64 = "-L-L/usr/lib64",
+ x86 = "",
+ x86_64 = "",
}
}
Index: premake-core-5.0.0-beta2/modules/d/tools/gdc.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/modules/d/tools/gdc.lua
+++ premake-core-5.0.0-beta2/modules/d/tools/gdc.lua
@@ -228,8 +228,8 @@
gdc.libraryDirectories = {
architecture = {
- x86 = "-L/usr/lib",
- x86_64 = "-L/usr/lib64",
+ x86 = "",
+ x86_64 = "",
}
}
Index: premake-core-5.0.0-beta2/modules/d/tools/ldc.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/modules/d/tools/ldc.lua
+++ premake-core-5.0.0-beta2/modules/d/tools/ldc.lua
@@ -323,8 +323,8 @@
ldc.libraryDirectories = {
architecture = {
- x86 = "-L=-L/usr/lib",
- x86_64 = "-L=-L/usr/lib64",
+ x86 = "",
+ x86_64 = "",
}
}
Index: premake-core-5.0.0-beta2/modules/gmake/tests/cpp/test_ldflags.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/modules/gmake/tests/cpp/test_ldflags.lua
+++ premake-core-5.0.0-beta2/modules/gmake/tests/cpp/test_ldflags.lua
@@ -55,7 +55,7 @@
system (p.LINUX)
prepare()
test.capture [[
- ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
+ ALL_LDFLAGS += $(LDFLAGS) -m64
]]
end
@@ -64,7 +64,7 @@
system (p.LINUX)
prepare()
test.capture [[
- ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
+ ALL_LDFLAGS += $(LDFLAGS) -m32
]]
end
Index: premake-core-5.0.0-beta2/modules/gmake2/tests/test_gmake2_ldflags.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/modules/gmake2/tests/test_gmake2_ldflags.lua
+++ premake-core-5.0.0-beta2/modules/gmake2/tests/test_gmake2_ldflags.lua
@@ -56,7 +56,7 @@ ALL_LDFLAGS += $(LDFLAGS) -L../libs -Lli
system (p.LINUX)
prepare()
test.capture [[
-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
+ALL_LDFLAGS += $(LDFLAGS) -m64
]]
end
@@ -65,7 +65,7 @@ ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -
system (p.LINUX)
prepare()
test.capture [[
-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
+ALL_LDFLAGS += $(LDFLAGS) -m32
]]
end
Index: premake-core-5.0.0-beta2/src/tools/gcc.lua
===================================================================
--- premake-core-5.0.0-beta2.orig/src/tools/gcc.lua
+++ premake-core-5.0.0-beta2/src/tools/gcc.lua
@@ -477,16 +477,10 @@
architecture = {
x86 = function (cfg)
local r = {}
- if not table.contains(os.getSystemTags(cfg.system), "darwin") then
- table.insert (r, "-L/usr/lib32")
- end
return r
end,
x86_64 = function (cfg)
local r = {}
- if not table.contains(os.getSystemTags(cfg.system), "darwin") then
- table.insert (r, "-L/usr/lib64")
- end
return r
end,
},
|
