smallsolar/kiwix-build
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-build.git synced 2025-06-26 10:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not hardcode binary's name in templates.

Browse Source 
This may change from on host platform to another. Use the cross_env.
This commit is contained in:
Matthieu Gautier
2017-02-06 17:33:39 +01:00
parent 2451c35d79
commit b205526bb2
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/bash_wrapper.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/sh
#!/bin/sh
if test -z "$PATH_ORIG" ; then
@ -10,10 +10,10 @@ PATH="{root_path}/bin:$PATH_ORIG"; export PATH;
HOST_CC=gcc; export HOST_CC;
unset PKG_CONFIG_PATH;
CC={which.i686-w64-mingw32-gcc}; export CC
AR={which.i686-w64-mingw32-ar}; export AR
CXX={which.i686-w64-mingw32-g++}; export CXX
STRIP={which.i686-w64-mingw32-strip}; export STRIP
CC={which:{binaries[c]}}; export CC
AR={which:{binaries[ar]}}; export AR
CXX={which:{binaries[cpp]}}; export CXX
STRIP={which:{binaries[strip]}}; export STRIP
CFLAGS=" -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"; export CFLAGS;
CXXFLAGS=" -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"; export CXXFLAGS;

10
templates/cmake_cross_file.txt
View File

@ -2,11 +2,11 @@ SET(CMAKE_SYSTEM_NAME Windows)
SET(CMAKE_SYSTEM_PROCESSOR x86)
# specify the cross compiler
SET(CMAKE_C_COMPILER {which.i686-w64-mingw32-gcc})
SET(CMAKE_CXX_COMPILER {which.i686-w64-mingw32-g++})
SET(CMAKE_RC_COMPILER {which.i686-w64-mingw32-windres})
SET(CMAKE_AR:FILEPATH {which.i686-w64-mingw32-ar})
SET(CMAKE_RANLIB:FILEPATH {which.i686-w64-mingw32-ranlib})
SET(CMAKE_C_COMPILER {which:{binaries[c]}})
SET(CMAKE_CXX_COMPILER {which:{binaries[cpp]}})
SET(CMAKE_RC_COMPILER {which:{binaries[windres]}})
SET(CMAKE_AR:FILEPATH {which:{binaries[ar]}})
SET(CMAKE_RANLIB:FILEPATH {which:{binaries[ranlib]}})
# where is the target environment
SET(CMAKE_FIND_ROOT_PATH {root_path})

8
templates/meson_cross_file.txt
View File

@ -1,9 +1,9 @@
[binaries]
pkgconfig = 'pkg-config'
c = '{which.i686-w64-mingw32-gcc}'
ar = '{which.i686-w64-mingw32-ar}'
cpp = '{which.i686-w64-mingw32-g++}'
strip = '{which.i686-w64-mingw32-strip}'
c = '{which:{binaries[c]}}'
ar = '{which:{binaries[ar]}}'
cpp = '{which:{binaries[cpp]}}'
strip = '{which:{binaries[strip]}}'
exe_wrapper = 'wine'
[properties]