From 516d7a4f76265894faa17c6de8f15121dee6d41f Mon Sep 17 00:00:00 2001 From: Erica Marigold Date: Sat, 26 Apr 2025 07:48:36 +0100 Subject: [PATCH] build: fix panics for initial runs and remove def exports --- build/build.go | 6 ++- internal/_cgo_export.h | 91 ------------------------------------------ 2 files changed, 4 insertions(+), 93 deletions(-) delete mode 100644 internal/_cgo_export.h diff --git a/build/build.go b/build/build.go index b587dae..fa16bcc 100644 --- a/build/build.go +++ b/build/build.go @@ -39,7 +39,7 @@ func buildVm(artifactPath string, cmakeFlags ...string) { buildDir := path.Join(dir, "cmake") bail(os.Mkdir(buildDir, os.ModePerm)) - defaultCmakeFlags := []string{"..", "-DCMAKE_BUILD_TYPE=RelWithDebInfo", "-DLUAU_EXTERN_C=ON"} + defaultCmakeFlags := []string{"..", "-DCMAKE_BUILD_TYPE=RelWithDebInfo", "-DLUAU_EXTERN_C=ON", "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"} Exec("cmake", buildDir, append(defaultCmakeFlags, cmakeFlags...)...) Exec("cmake", buildDir, "--build", ".", "--target Luau.VM", "--config", "RelWithDebInfo") @@ -79,7 +79,9 @@ func main() { } lockfileContents, err := os.ReadFile(lockfilePath) - bail(err) + if !os.IsNotExist(err) { + bail(err) + } serFeatures := fmt.Sprintf("%v", features) toCleanBuild := string(lockfileContents) != serFeatures diff --git a/internal/_cgo_export.h b/internal/_cgo_export.h deleted file mode 100644 index 96d86e8..0000000 --- a/internal/_cgo_export.h +++ /dev/null @@ -1,91 +0,0 @@ -/* Code generated by cmd/cgo; DO NOT EDIT. */ - -/* package internal */ - - -#line 1 "cgo-builtin-export-prolog" - -#include - -#ifndef GO_CGO_EXPORT_PROLOGUE_H -#define GO_CGO_EXPORT_PROLOGUE_H - -#ifndef GO_CGO_GOSTRING_TYPEDEF -typedef struct { const char *p; ptrdiff_t n; } _GoString_; -#endif - -#endif - -/* Start of preamble from import "C" comments. */ - - -#line 3 "lua.go" - - -// #cgo LDFLAGS: -L${SRCDIR}/luau/cmake -lLuau.VM -lm -lstdc++ -#include "/home/compey/dev/gluau/internal/luau/VM/include/lua.h" -#include "/home/compey/dev/gluau/internal/luau/VM/include/lualib.h" -#include -#include "/home/compey/dev/gluau/internal/clua.h" - -#line 1 "cgo-generated-wrapper" - - -/* End of preamble from import "C" comments. */ - - -/* Start of boilerplate cgo prologue. */ -#line 1 "cgo-gcc-export-header-prolog" - -#ifndef GO_CGO_PROLOGUE_H -#define GO_CGO_PROLOGUE_H - -typedef signed char GoInt8; -typedef unsigned char GoUint8; -typedef short GoInt16; -typedef unsigned short GoUint16; -typedef int GoInt32; -typedef unsigned int GoUint32; -typedef long long GoInt64; -typedef unsigned long long GoUint64; -typedef GoInt64 GoInt; -typedef GoUint64 GoUint; -typedef size_t GoUintptr; -typedef float GoFloat32; -typedef double GoFloat64; -#ifdef _MSC_VER -#include -typedef _Fcomplex GoComplex64; -typedef _Dcomplex GoComplex128; -#else -typedef float _Complex GoComplex64; -typedef double _Complex GoComplex128; -#endif - -/* - static assertion to make sure the file is being used on architecture - at least with matching size of GoInt. -*/ -typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1]; - -#ifndef GO_CGO_GOSTRING_TYPEDEF -typedef _GoString_ GoString; -#endif -typedef void *GoMap; -typedef void *GoChan; -typedef struct { void *t; void *v; } GoInterface; -typedef struct { void *data; GoInt len; GoInt cap; } GoSlice; - -#endif - -/* End of boilerplate cgo prologue. */ - -#ifdef __cplusplus -extern "C" { -#endif - -extern GoUintptr go_allocf(GoUintptr fp, GoUintptr ptr, GoUint64 osize, GoUint64 nsize); - -#ifdef __cplusplus -} -#endif