From af9c10c3195305abe40e8851823dbda6d813e930 Mon Sep 17 00:00:00 2001
From: Abhijeet Patil <abhijeet@neon.tech>
Date: Wed, 17 Jan 2024 21:53:47 +0000
Subject: [PATCH] fixing build

---
 .github/workflows/build_and_test.yml | 10 +++++-----
 Makefile                             |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 7e62015234..cef1b4edc1 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -182,7 +182,7 @@ jobs:
         run: cargo deny check --hide-inclusion-graph
 
   build-neon:
-    needs: [ check-permissions, tag, build-buildtools-image ]
+    needs: [ check-permissions, tag, build-buildtools-image, check-codestyle-rust ]
     runs-on: [ self-hosted, gen3, large ]
     container:
       image: 369495373322.dkr.ecr.eu-central-1.amazonaws.com/build-tools:${{ needs.build-buildtools-image.outputs.build-tools-tag }}
@@ -274,21 +274,21 @@ jobs:
             CC=clang
           elif [[ $BUILD_TYPE == "release" ]]; then
             cov_prefix=""
+            CARGO_FLAGS="--locked --release"
             ASAN_OPTIONS=""
             UBSAN_OPTIONS=""
             RUSTFLAGS="-C linker=gcc"
-            CARGO_FLAGS="--locked --release"
             CC=gcc
           fi
           {
             echo "cov_prefix=${cov_prefix}"
+            echo "CARGO_FEATURES=${CARGO_FEATURES}"
+            echo "CARGO_FLAGS=${CARGO_FLAGS}"
+            echo "CARGO_HOME=${GITHUB_WORKSPACE}/.cargo"
             echo "ASAN_OPTIONS=${ASAN_OPTIONS}"
             echo "UBSAN_OPTIONS=${UBSAN_OPTIONS}"
             echo "RUSTFLAGS=${RUSTFLAGS}"
             echo "CC=${CC}"
-            echo "CARGO_FEATURES=${CARGO_FEATURES}"
-            echo "CARGO_FLAGS=${CARGO_FLAGS}"
-            echo "CARGO_HOME=${GITHUB_WORKSPACE}/.cargo"
           } >> $GITHUB_ENV
 
       # Disabled for now
diff --git a/Makefile b/Makefile
index 152bf9da1b..0c2d939203 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ else ifeq ($(BUILD_TYPE),debug)
 	PG_CONFIGURE_OPTS = --enable-debug --with-openssl --enable-cassert --enable-depend
 	PG_CFLAGS = -O0 -g3 $(CFLAGS)
 	CPPFLAGS = -fsanitize=address -fsanitize=undefined -fno-sanitize-recover -fno-sanitize=function -Wno-cast-function-type-strict
-	LDFLAGS = -fsanitize=address -fsanitize=undefined -static-libsan
+	LDFLAGS = -fsanitize=address -fsanitize=undefined -static-libasan
 else
 	$(error Bad build type '$(BUILD_TYPE)', see Makefile for options)
 endif