Skip to content

Windows: Build lua with 5.2 compatibility #12978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 2 commits into from
Sep 9, 2020
Merged

Windows: Build lua with 5.2 compatibility #12978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6cde18
Windows: Build lua with 5.2 compatibility
sunjayBhatia Sep 3, 2020
e18ec9d
Merge remote-tracking branch 'origin/master' into windows-build-lua-5…
wrowe Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bazel/foreign_cc/luajit.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ EOF

@setlocal
-@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
+@set LJCOMPILE=cl /nologo /c /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
+@set LJCOMPILE=cl /nologo /c /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /DLUAJIT_ENABLE_LUA52COMPAT
Copy link
Member

@dio dio Sep 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, just curious, why we remove /O2 here?

Copy link
Member Author

@sunjayBhatia sunjayBhatia Sep 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/O2 placed there was being applied to to debug and release build modes, it was removed here to enable us to target it to just release mode and disable optimizations entirely in debug

cc @wrowe

Copy link
Contributor

@wrowe wrowe Sep 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll find /O2 is still applied appropriately later in the script, @dio

Copy link
Member

@dio dio Sep 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. Thanks, @wrowe.

@set LJLINK=link /nologo
@set LJMT=mt /nologo
@set LJLIB=lib /nologo /nodefaultlib
Expand Down
2 changes: 1 addition & 1 deletion bazel/foreign_cc/moonjit.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ index c2d2c212..71f24422 100644
@rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK
@set DEBUGCFLAGS=
-@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
+@set LJCOMPILE=cl /nologo /c /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
+@set LJCOMPILE=cl /nologo /c /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /DLUAJIT_ENABLE_LUA52COMPAT
@set LJLINK=link /nologo
@set LJMT=mt /nologo
@set LJLIB=lib /nologo /nodefaultlib
Expand Down
1 change: 0 additions & 1 deletion test/extensions/filters/common/lua/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ envoy_cc_test(
envoy_cc_test(
name = "wrappers_test",
srcs = ["wrappers_test.cc"],
tags = ["fails_on_windows"],
deps = [
":lua_wrappers_lib",
"//source/common/buffer:buffer_lib",
Expand Down
2 changes: 0 additions & 2 deletions test/extensions/filters/http/lua/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ envoy_extension_cc_test(
name = "lua_filter_test",
srcs = ["lua_filter_test.cc"],
extension_name = "envoy.filters.http.lua",
tags = ["fails_on_windows"],
deps = [
"//source/common/stream_info:stream_info_lib",
"//source/extensions/filters/http/lua:lua_filter_lib",
Expand All @@ -36,7 +35,6 @@ envoy_extension_cc_test(
name = "wrappers_test",
srcs = ["wrappers_test.cc"],
extension_name = "envoy.filters.http.lua",
tags = ["fails_on_windows"],
deps = [
"//source/common/stream_info:stream_info_lib",
"//source/extensions/filters/http/lua:wrappers_lib",
Expand Down