evmc: make evmc CFLAGS to use include dir

moving loader and header dependencies to include/ dir, following steps found here: ethereum/evmc@65d11a2 This might help to resolve issue with go mod working with core-geth as a dependency. Signed-off-by: meows <b5c6@protonmail.com>
etclabscore · Jul 30, 2020 · 361ef38 · 361ef38
1 parent 56e3477
commit 361ef38
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/evmc/bindings/go/evmc/evmc.go b/evmc/bindings/go/evmc/evmc.go
@@ -5,7 +5,7 @@
 package evmc
 
 /*
-#cgo CFLAGS:  -I${SRCDIR}/.. -Wall -Wextra
+#cgo CFLAGS: -I${SRCDIR}/../../../include -Wall -Wextra
 #cgo !windows LDFLAGS: -ldl
 
 #include <evmc/evmc.h>

diff --git a/evmc/bindings/go/evmc/evmc.h b/evmc/bindings/go/evmc/evmc.h
diff --git a/evmc/bindings/go/evmc/helpers.h b/evmc/bindings/go/evmc/helpers.h
diff --git a/evmc/bindings/go/evmc/host.go b/evmc/bindings/go/evmc/host.go
@@ -5,7 +5,7 @@
 package evmc
 
 /*
-#cgo CFLAGS:  -I${SRCDIR}/.. -Wall -Wextra -Wno-unused-parameter
+#cgo CFLAGS: -I${SRCDIR}/../../../include -Wall -Wextra -Wno-unused-parameter
 
 #include <evmc/evmc.h>
 #include <evmc/helpers.h>

diff --git a/evmc/bindings/go/evmc/loader.c b/evmc/bindings/go/evmc/loader.c
diff --git a/evmc/bindings/go/evmc/loader.c b/evmc/bindings/go/evmc/loader.c
@@ -0,0 +1,4 @@
+/* Include evmc::loader in the Go package.
+ * The "go build" builds all additional C/C++ files in the Go package directory,
+ * but symbolic links are ignored so #include is used instead. */
+#include "../../../lib/loader/loader.c"
diff --git a/evmc/bindings/go/evmc/loader.h b/evmc/bindings/go/evmc/loader.h