blob: 8d5f62d57f3e3046081b98d6ab0b0b38eb497cdc (
plain) (
blame)
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
|
--- src/luarocks/cfg.lua.orig 2015-12-29 15:50:11 UTC
+++ src/luarocks/cfg.lua
@@ -88,7 +88,15 @@ elseif proc:match("Power Macintosh") the
cfg.target_cpu = proc
end
-if system == "FreeBSD" then
+if system == "Bitrig" then
+ cfg.platforms.unix = true
+ cfg.platforms.bitrig = true
+ cfg.platforms.bsd = true
+elseif system == "DragonFly" then
+ cfg.platforms.unix = true
+ cfg.platforms.dragonfly = true
+ cfg.platforms.bsd = true
+elseif system == "FreeBSD" then
cfg.platforms.unix = true
cfg.platforms.freebsd = true
cfg.platforms.bsd = true
@@ -477,16 +485,18 @@ if cfg.platforms.unix then
defaults.lib_extension = "so"
defaults.external_lib_extension = "so"
defaults.obj_extension = "o"
- defaults.external_deps_dirs = { "/usr/local", "/usr" }
+ defaults.external_deps_dirs = { site_config.LUAROCKS_PREFIX, "/usr" }
defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "/usr/local/bin"
defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include"
defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib"
- defaults.variables.CFLAGS = "-O2"
+ defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2"
defaults.cmake_generator = "Unix Makefiles"
- defaults.variables.CC = "gcc"
- defaults.variables.LD = "gcc"
+ defaults.variables.MAKE = os.getenv("MAKE") or defaults.variables.MAKE
+ -- Assume "cc" is a modern GCC-compatible compiler
+ defaults.variables.CC = os.getenv("CC") or defaults.variables.CC
+ defaults.variables.LD = os.getenv("CC") or defaults.variables.CC
defaults.gcc_rpath = true
- defaults.variables.LIBFLAG = "-shared"
+ defaults.variables.LIBFLAG = (os.getenv("LDFLAGS") or "").." -shared"
defaults.external_deps_patterns = {
bin = { "?" },
lib = { "lib?.a", "lib?.so", "lib?.so.*" },
@@ -548,11 +558,17 @@ if cfg.platforms.linux then
defaults.arch = "linux-"..cfg.target_cpu
end
+if cfg.platforms.bitrig then
+ defaults.arch = "bitrig-"..cfg.target_cpu
+end
+
+if cfg.platforms.dragonfly then
+ defaults.arch = "dragonfly-"..cfg.target_cpu
+end
+
if cfg.platforms.freebsd then
defaults.arch = "freebsd-"..cfg.target_cpu
defaults.gcc_rpath = false
- defaults.variables.CC = "cc"
- defaults.variables.LD = "cc"
end
if cfg.platforms.openbsd then
|
