From ffe4d785ba0c919fdf84db0df2ae67ed2b05f5c5 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Mon, 2 Sep 2024 20:13:36 +0100 Subject: [PATCH] [make] Remove \r from haxelib libpath output Otherwise we end up with the carriage return still being there on windows --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0aacc35c958..54d44b11816 100644 --- a/Makefile +++ b/Makefile @@ -115,17 +115,19 @@ HAXELIB_INTERP=HAXE_STD_PATH=$(HAXE_STD_PATH) $(CURDIR)/$(HAXE_OUTPUT) \ --hxb-lib $(HAXELIB_SRC_PATH)/haxelib_hxb.zip \ --run haxelib.client.Main +HXCPP_LIBPATH = `$(HAXELIB_INTERP) libpath hxcpp | tr -d '\r'` + haxelib_hxcpp: $(HAXELIB_SRC_PATH)/haxelib_hxb.zip $(HAXELIB_INTERP) config > /dev/null || $(HAXELIB_INTERP) newrepo $(HAXELIB_INTERP) path hxcpp > /dev/null || \ ($(HAXELIB_INTERP) git hxcpp https://github.com/HaxeFoundation/hxcpp.git && \ - hxcpp_path=`$(HAXELIB_INTERP) libpath hxcpp` && \ + hxcpp_path=$(HXCPP_LIBPATH) && \ $(CURDIR)/$(HAXE_OUTPUT) --cwd $$hxcpp_path/tools/hxcpp compile.hxml) # haxelib should depends on haxe, but we don't want to do that... # since haxelib isn't available in PATH yet, we have to pass -D no-compilation and build manually haxelib: $(HAXELIB_SRC_PATH)/haxelib_hxb.zip haxelib_hxcpp - hxcpp_path=`$(HAXELIB_INTERP) libpath hxcpp` \ + hxcpp_path=$(HXCPP_LIBPATH) \ HAXE_STD_PATH=$(HAXE_STD_PATH) $(CURDIR)/$(HAXE_OUTPUT) --cwd $(HAXELIB_SRC_PATH) \ client_cpp.hxml -D destination=../../../../$(HAXELIB_OUTPUT) -D no-compilation -D hxcpp.path=$$hxcpp_path $(HAXELIB_INTERP) --cwd $(HAXELIB_SRC_PATH)/bin/cpp run hxcpp Build.xml haxe