Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51c49e59 authored Jul 23, 2020 by Dan Willemsen

Revert "Move some prebuilt build tool configs to Soong"

This reverts commit 3e1c9115.

Reason for revert: broke builds where makefiles were using M4 without depending upon it

Change-Id: Ib2deef08255656b91cb8ec42f1cb7e9555364f23

parent 3e1c9115

core/config.mk

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -587,8 +587,16 @@ SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip
	# ---------------------------------------------------------------		# ---------------------------------------------------------------
	# Generic tools.		# Generic tools.

	# These dependencies are now handled via dependencies on prebuilt_build_tool		LEX := $(prebuilt_build_tools_bin_noasan)/flex
	BISON_DATA :=$=		# The default PKGDATADIR built in the prebuilt bison is a relative path
			# prebuilts/build-tools/common/bison.
			# To run bison from elsewhere you need to set up enviromental variable
			# BISON_PKGDATADIR.
			BISON_PKGDATADIR := $(prebuilt_build_tools)/common/bison
			BISON := $(prebuilt_build_tools_bin_noasan)/bison
			YACC := $(BISON) -d
			BISON_DATA := $(wildcard $(BISON_PKGDATADIR)/* $(BISON_PKGDATADIR)//)
			M4 :=$= $(prebuilt_build_tools_bin_noasan)/m4

	YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm		YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm

core/main.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -33,8 +33,6 @@ endif

	include $(SOONG_MAKEVARS_MK)		include $(SOONG_MAKEVARS_MK)

	YACC :=$= $(BISON) -d

	include $(BUILD_SYSTEM)/clang/config.mk		include $(BUILD_SYSTEM)/clang/config.mk

	# Write the build number to a file so it can be read back in		# Write the build number to a file so it can be read back in