diff --git a/devel/meson/meson.mk b/devel/meson/meson.mk index 7645284ac..16c6b1668 100644 --- a/devel/meson/meson.mk +++ b/devel/meson/meson.mk @@ -42,8 +42,8 @@ endef define Meson/CreateNativeFile $(STAGING_DIR_HOST)/bin/sed \ - -e "s|@CC@|$(HOSTCC)|" \ - -e "s|@CXX@|$(HOSTCXX)|" \ + -e "s|@CC@|$(foreach BIN,$(HOSTCC),'$(BIN)',)|" \ + -e "s|@CXX@|$(foreach BIN,$(HOSTCXX),'$(BIN)',)|" \ -e "s|@PKGCONFIG@|$(PKG_CONFIG)|" \ -e "s|@CFLAGS@|$(foreach FLAG,$(HOST_CFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \ -e "s|@CXXFLAGS@|$(foreach FLAG,$(HOST_CXXFLAGS) $(HOST_CPPFLAGS),'$(FLAG)',)|" \ @@ -55,8 +55,8 @@ endef define Meson/CreateCrossFile $(STAGING_DIR_HOST)/bin/sed \ - -e "s|@CC@|$(TARGET_CC)|" \ - -e "s|@CXX@|$(TARGET_CXX)|" \ + -e "s|@CC@|$(foreach BIN,$(TARGET_CC),'$(BIN)',)|" \ + -e "s|@CXX@|$(foreach BIN,$(TARGET_CXX),'$(BIN)',)|" \ -e "s|@AR@|$(TARGET_AR)|" \ -e "s|@STRIP@|$(TARGET_CROSS)strip|" \ -e "s|@NM@|$(TARGET_NM)|" \ diff --git a/devel/meson/src/openwrt-cross.txt.in b/devel/meson/src/openwrt-cross.txt.in index 63640585f..f8c2db9dc 100644 --- a/devel/meson/src/openwrt-cross.txt.in +++ b/devel/meson/src/openwrt-cross.txt.in @@ -1,6 +1,6 @@ [binaries] -c = '@CC@' -cpp = '@CXX@' +c = [@CC@] +cpp = [@CXX@] ar = '@AR@' strip = '@STRIP@' nm = '@NM@' diff --git a/devel/meson/src/openwrt-native.txt.in b/devel/meson/src/openwrt-native.txt.in index 30990eb3c..e5d5a2617 100644 --- a/devel/meson/src/openwrt-native.txt.in +++ b/devel/meson/src/openwrt-native.txt.in @@ -1,6 +1,6 @@ [binaries] -c = '@CC@' -cpp = '@CXX@' +c = [@CC@] +cpp = [@CXX@] pkgconfig = '@PKGCONFIG@' [properties]