diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-05-02 11:08:01 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-05-02 11:08:01 +0100 |
| commit | c80a281ea5566f0005bf3c51d3f9e83fb5acea02 (patch) | |
| tree | 89d12a34c3866f0406168d08f16d09b090f5b1f9 /utils | |
| parent | 1eb49059aba72345a05336c0f669896a0351d648 (diff) | |
| download | netsurf-c80a281ea5566f0005bf3c51d3f9e83fb5acea02.tar.gz netsurf-c80a281ea5566f0005bf3c51d3f9e83fb5acea02.tar.bz2 | |
update to cope with make tool naming
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/jenkins-build.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index 084069f31..7a590f426 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -49,6 +49,9 @@ OLD_IDENTIFIER="$CC-${BUILD_JS}-$((BUILD_NUMBER - ${OLD_ARTIFACT_COUNT}))" # default atari architecture - bletch ATARIARCH=68020-60 +# make tool +MAKE=make + # Ensure the combination of target and toolchain works and set build # specific parameters too case ${TARGET} in @@ -169,6 +172,7 @@ case ${TARGET} in "amd64-unknown-openbsd5.4") ARTIFACT_TARGET=OpenBSD + MAKE=gmake ;; *) @@ -344,11 +348,10 @@ fi ########### Build from source ################## # Clean first -make NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} clean +${MAKE} NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} clean # Do the Build -make -k NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} Q= - +${MAKE} -k NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} Q= @@ -356,7 +359,7 @@ make -k NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${B ############ Package artifact construction ################ # build the package file -make -k NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} package Q= +${MAKE} -k NETSURF_USE_JS=${BUILD_JS} NETSURF_USE_MOZJS=${BUILD_MOZJS} CI_BUILD=${BUILD_NUMBER} ATARIARCH=${ATARIARCH} package Q= if [ ! -f "${PKG_SRC}${PKG_SFX}" ]; then # unable to find package file |