Support successfully bootstrapping on Solaris (OpenIndiana).
Some support already existed, but not enough. Also the "linkoptions" provided was incompatible with the Solaris ld.
This commit is contained in:
parent
8d0dce9c65
commit
755a7e6d66
@ -91,6 +91,16 @@ bsd: $(SRC)
|
||||
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
|
||||
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
|
||||
|
||||
solaris: $(SRC)
|
||||
$(SILENT) rm -rf ./bin
|
||||
$(SILENT) rm -rf ./build
|
||||
$(SILENT) rm -rf ./obj
|
||||
mkdir -p build/bootstrap
|
||||
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lm
|
||||
./build/bootstrap/premake_bootstrap embed
|
||||
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
|
||||
$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
|
||||
|
||||
windows-base: $(SRC)
|
||||
$(SILENT) if exist .\bin rmdir /s /q .\bin
|
||||
$(SILENT) if exist .\build rmdir /s /q .\build
|
||||
|
@ -86,6 +86,11 @@
|
||||
# include "config-linux.h"
|
||||
#endif
|
||||
|
||||
#if defined(__sun__) && defined(__svr4__)
|
||||
# include "config-linux.h"
|
||||
# undef HAVE_IOCTL_SIOCGIFADDR
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__ && __MACH__
|
||||
# include "config-osx.h"
|
||||
#endif
|
||||
|
@ -26,7 +26,7 @@ project "curl-lib"
|
||||
filter { "system:not windows", "system:not macosx" }
|
||||
defines { "USE_MBEDTLS" }
|
||||
|
||||
filter { "system:linux or bsd" }
|
||||
filter { "system:linux or bsd or solaris" }
|
||||
defines { "CURL_HIDDEN_SYMBOLS" }
|
||||
|
||||
-- find the location of the ca bundle
|
||||
@ -37,6 +37,7 @@ project "curl-lib"
|
||||
"/usr/share/ssl/certs/ca-bundle.crt",
|
||||
"/usr/local/share/certs/ca-root.crt",
|
||||
"/usr/local/share/certs/ca-root-nss.crt",
|
||||
"/etc/certs/ca-certificates.crt",
|
||||
"/etc/ssl/cert.pem" } do
|
||||
if os.isfile(f) then
|
||||
ca = f
|
||||
|
@ -11,7 +11,7 @@ project "zip-lib"
|
||||
"**.c"
|
||||
}
|
||||
|
||||
filter "system:linux or bsd"
|
||||
filter "system:linux or bsd or solaris"
|
||||
defines { "HAVE_SSIZE_T_LIBZIP", "HAVE_CONFIG_H" }
|
||||
|
||||
filter "system:windows"
|
||||
|
@ -21,7 +21,7 @@ project "lua-lib"
|
||||
"etc/*.c"
|
||||
}
|
||||
|
||||
filter "system:linux or bsd or hurd or aix"
|
||||
filter "system:linux or bsd or hurd or aix or solaris"
|
||||
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
|
||||
|
||||
filter "system:macosx"
|
||||
|
@ -75,7 +75,7 @@
|
||||
linkoptions { "-mmacosx-version-min=10.4" }
|
||||
|
||||
configuration { "solaris" }
|
||||
linkoptions { "-Wl,--export-dynamic" }
|
||||
links { "m", "socket", "nsl" }
|
||||
|
||||
configuration "aix"
|
||||
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
|
||||
|
@ -191,7 +191,7 @@
|
||||
toolset "clang"
|
||||
|
||||
filter { "system:solaris" }
|
||||
linkoptions { "-Wl,--export-dynamic" }
|
||||
links { "m", "socket", "nsl" }
|
||||
|
||||
filter "system:aix"
|
||||
defines { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
|
||||
|
Reference in New Issue
Block a user