Browse Source

Merge pull request #10984 from dhewg/pull/meson

meson: fix building host binaries with ccache
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
8772d56eb5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
  1. +4
    -4
      devel/meson/meson.mk
  2. +2
    -2
      devel/meson/src/openwrt-cross.txt.in
  3. +2
    -2
      devel/meson/src/openwrt-native.txt.in

+ 4
- 4
devel/meson/meson.mk View File

@ -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)|" \


+ 2
- 2
devel/meson/src/openwrt-cross.txt.in View File

@ -1,6 +1,6 @@
[binaries]
c = '@CC@'
cpp = '@CXX@'
c = [@CC@]
cpp = [@CXX@]
ar = '@AR@'
strip = '@STRIP@'
nm = '@NM@'


+ 2
- 2
devel/meson/src/openwrt-native.txt.in View File

@ -1,6 +1,6 @@
[binaries]
c = '@CC@'
cpp = '@CXX@'
c = [@CC@]
cpp = [@CXX@]
pkgconfig = '@PKGCONFIG@'
[properties]


Loading…
Cancel
Save