Set LD_LIBRARY_PATH when calling gcc to build alt-java
This commit is contained in:
parent
4e980c8621
commit
42a86dbbd3
1 changed files with 3 additions and 1 deletions
|
|
@ -1509,13 +1509,14 @@ function packagejdk() {
|
|||
DEVKIT_ROOT=$(pwd)/devkit
|
||||
source ${DEVKIT_ROOT}/devkit.info
|
||||
GCC="${DEVKIT_TOOLCHAIN_PATH}/gcc --sysroot=${DEVKIT_SYSROOT}"
|
||||
LIBPATH="${DEVKIT_ROOT}/lib:${DEVKIT_ROOT}/lib64"
|
||||
%else
|
||||
GCC=$(which gcc)
|
||||
%endif
|
||||
|
||||
echo "Building %{SOURCE11}"
|
||||
mkdir -p %{altjavaoutputdir}
|
||||
${GCC} ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11}
|
||||
LD_LIBRARY_PATH="${LIBPATH}" ${GCC} ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11}
|
||||
echo "Generating %{alt_java_name} man page"
|
||||
altjavamanpage=%{altjavaoutputdir}/%{alt_java_name}.1
|
||||
echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > ${altjavamanpage}
|
||||
|
|
@ -1970,6 +1971,7 @@ done
|
|||
- Rebuild CDS archives against the updated lib/modules
|
||||
- Require openjdk-devkit 1.0-4 to bring in fixes for .comment section and deterministic archives
|
||||
- Bump devkit requirement to 1.0-5 to bring in the bootstrapped version
|
||||
- Set LD_LIBRARY_PATH when calling gcc to build alt-java
|
||||
- Resolves: OPENJDK-2820
|
||||
- Resolves: OPENJDK-2821
|
||||
- Resolves: OPENJDK-2585
|
||||
|
|
|
|||
Loading…
Reference in a new issue