diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2019-02-06 14:02:08 +0000 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2019-02-06 14:18:12 +0000 |
| commit | 571d52b3e028d148e6ba9dd6642afed27fadea15 (patch) | |
| tree | 6857ca35272600646388881baa417bf55aef2d76 /jdk8-build-release.yaml | |
| parent | b75e15646a1ac47ebd5a994d8e88fd1e3f55fe0a (diff) | |
jdk: Fixup release builds.
There was an error where an out directory was created unnecessarily.
Change-Id: Ia119f6f2a87e99ef17b805514b9de9d44e9e2f3a
Diffstat (limited to 'jdk8-build-release.yaml')
| -rw-r--r-- | jdk8-build-release.yaml | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/jdk8-build-release.yaml b/jdk8-build-release.yaml index eac29608..a9d34f41 100644 --- a/jdk8-build-release.yaml +++ b/jdk8-build-release.yaml @@ -72,8 +72,7 @@ ccache_build_opts=--disable-ccache - # Setup archive directory - mkdir out + rm -rf jdk* primordial-jdk* build* out cd $HOME/srv/jdk-cache/jdk8u export JAVA_HOME=${PWD} @@ -82,9 +81,6 @@ cd ${WORKSPACE} - # Setup archive directory - mkdir out - # Extract sources from upstream job rm -rf jdk8u tar xf incoming/jdk8u.tar.gz @@ -97,17 +93,25 @@ shopt -s nullglob # Configure and build. - rm -rf build* - mkdir -p build-stage1 build-stage2 + mkdir -p build-stage1 build-stage2 out two_stage_build=0 which java java -version + EXTRA_CFLAGS="-Wno-error -fno-delete-null-pointer-checks \ + -fno-lifetime-dse -Wno-deprecated-declarations \ + -Wno-maybe-uninitialized -Wno-misleading-indentation \ + -Wno-shift-negative-value" + EXTRA_CPP_FLAGS="-Wno-error -std=gnu++98 \ + -fno-delete-null-pointer-checks -fno-lifetime-dse \ + -Wno-deprecated-declarations -Wno-maybe-uninitialized \ + -Wno-misleading-indentation -Wno-shift-negative-value" if [ $two_stage_build = 1 ]; then pushd build-stage1 - sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk7 ${ccache_build_opts} + sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk7 ${ccache_build_opts} \ + --with-extra-cxxflags="$EXTRA_CPP_FLAGS" --with-extra-cflags="$EXTRA_CFLAGS" make images popd @@ -115,6 +119,8 @@ sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} \ --with-boot-jdk=${WORKSPACE}/build-stage1/images/j2sdk-image \ ${ccache_build_opts} \ + --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ + --with-extra-cflags="$EXTRA_CFLAGS" \ --with-user-release-suffix="Linaro-$RELEASE" \ --with-milestone="release" make images @@ -123,6 +129,8 @@ pushd build-stage2 sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} \ ${ccache_build_opts} \ + --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ + --with-extra-cflags="$EXTRA_CFLAGS" \ --with-user-release-suffix="Linaro-$RELEASE" \ --with-milestone="release" make images |