Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed NaCl build.

Browse Source
This commit is contained in:
Branimir Karadzic
2014-11-15 18:51:21 -08:00
parent 07beb17487
commit 6bc5630008
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/toolchain.lua
View File

@@ -186,7 +186,7 @@ function toolchain(_buildDir, _libDir)
print("Set NACL_SDK_ROOT enviroment variables.") print("Set NACL_SDK_ROOT enviroment variables.")
end end
local naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_x86_newlib/bin/x86_64-nacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_x86_newlib/bin/x86_64-nacl-"
if os.is("macosx") then if os.is("macosx") then
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_x86_newlib/bin/x86_64-nacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_x86_newlib/bin/x86_64-nacl-"
elseif os.is("linux") then elseif os.is("linux") then
@@ -205,7 +205,7 @@ function toolchain(_buildDir, _libDir)
print("Set NACL_SDK_ROOT enviroment variables.") print("Set NACL_SDK_ROOT enviroment variables.")
end end
local naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_arm_newlib/bin/arm-nacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_arm_newlib/bin/arm-nacl-"
if os.is("macosx") then if os.is("macosx") then
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_arm_newlib/bin/arm-nacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_arm_newlib/bin/arm-nacl-"
elseif os.is("linux") then elseif os.is("linux") then
@@ -234,7 +234,7 @@ function toolchain(_buildDir, _libDir)
print("Set NACL_SDK_ROOT enviroment variables.") print("Set NACL_SDK_ROOT enviroment variables.")
end end
local naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_pnacl/bin/pnacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_pnacl/bin/pnacl-"
if os.is("macosx") then if os.is("macosx") then
naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_pnacl/bin/pnacl-" naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_pnacl/bin/pnacl-"
elseif os.is("linux") then elseif os.is("linux") then