linux: Improve helpers Makefile to use internal Meson

frida · Oct 21, 2024 · f8ffe77 · f8ffe77
1 parent 81028f8
commit f8ffe77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/linux/helpers/Makefile b/src/linux/helpers/Makefile
@@ -2,6 +2,7 @@ top_srcdir := ../../..
 releng := $(top_srcdir)/releng
 
 BUILDDIR ?= $(top_srcdir)/build
+MESON ?= $(releng)/meson/meson.py
 
 ifdef FRIDA_HOST
 host_machine := $(FRIDA_HOST)
@@ -14,8 +15,8 @@ crossfile := $(BUILDDIR)/frida-$(host_machine).txt
 
 build: ext/linux/tools/include/nolibc/nolibc.h
 	rm -rf build
-	meson setup --cross-file $(crossfile) -Db_lto=true build
-	meson compile -C build
+	$(MESON) setup --cross-file $(crossfile) -Db_lto=true build
+	$(MESON) compile -C build
 	cp build/bootstrapper.bin bootstrapper-$(host_arch).bin
 	cp build/loader.bin loader-$(host_arch).bin
 

diff --git a/src/linux/helpers/rebuild.sh b/src/linux/helpers/rebuild.sh
@@ -44,12 +44,6 @@ usage () {
   exit 1
 }
 
-setup_meson () {
-  ln -s "$RELENG_DIR/meson/meson.py" "$TMP_MESON_DIR/meson"
-  chmod +x "$TMP_MESON_DIR/meson"
-  export PATH="$TMP_MESON_DIR:$PATH"
-}
-
 ARCHS=(
   x86
   x86_64
@@ -84,8 +78,6 @@ build_arch () {
     export CC="gcc -m32" CXX="g++ -m32" STRIP="strip"
   fi
 
-  setup_meson
-
   cd "$FRIDA_CORE_DIR"
 
   rm -rf "$BUILD_DIR"