diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-06-14 00:53:34 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-06-14 00:53:34 +0300 |
| commit | 5f92c3275affc87b567da59aad67b548b660bfc2 (patch) | |
| tree | 6ca7d3db49d35cd4d56189eda5dbeb92e32f5be0 | |
| parent | 6b7cfa4d01aa64ba7153b33aa0287f25ea3e90c7 (diff) | |
Add FOR_BUILD variant of SYSTEM_LIBXSLT and use it to decide which xsltproc to run
| -rwxr-xr-x | configure.in | 4 | ||||
| -rwxr-xr-x | set_soenv.in | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 9f79e576e310..6d600c83cce1 100755 --- a/configure.in +++ b/configure.in @@ -1687,7 +1687,8 @@ if test "$cross_compiling" = "yes"; then test -f ./*Env.Set.sh 2>/dev/null || exit cp *Env.Set.sh ../Env.Build.sh . ./*Env.Set.sh - for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH; do + for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \ + SYSTEM_LIBXSLT; do VV='$'$V VV=`eval "echo $VV"` if test -n "$VV"; then @@ -1728,6 +1729,7 @@ AC_SUBST(GXX_INCLUDE_PATH_FOR_BUILD) AC_SUBST(INPATH_FOR_BUILD) AC_SUBST(OUTPATH_FOR_BUILD) AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD) +AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD) AC_SUBST(OUTDIR_FOR_BUILD) AC_SUBST(PATH_FOR_BUILD) diff --git a/set_soenv.in b/set_soenv.in index 2abc67b48b37..ac810cacc82e 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1767,6 +1767,7 @@ if ( '@CROSS_COMPILING@' eq 'YES' ) ToFile( "INPATH_FOR_BUILD", "@INPATH_FOR_BUILD@", "e" ); ToFile( "OUTPATH_FOR_BUILD", "@OUTPATH_FOR_BUILD@", "e" ); ToFile( "MACOSX_DEPLOYMENT_TARGET_FOR_BUILD", "@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@", "e" ); + ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT_FOR_BUILD@", "e" ); ToFile( "OUTDIR_FOR_BUILD", "@OUTDIR_FOR_BUILD@", "e"); ToFile( "SOLARINC_FOR_BUILD", "@SOLARINC_FOR_BUILD@", "e"); ToFile( "SOLARLIB_FOR_BUILD", "@SOLARLIB_FOR_BUILD@", "e"); @@ -1785,6 +1786,7 @@ else ToFile( "GXX_INCLUDE_PATH_FOR_BUILD", PathFormat("@GXX_INCLUDE_PATH@"), "e" ); ToFile( "INPATH_FOR_BUILD", $INPATH, "e" ); ToFile( "OUTPATH_FOR_BUILD", $OUTPATH, "e" ); + ToFile( "SYSTEM_LIBXSLT_FOR_BUILD", "@SYSTEM_LIBXSLT@", "e" ); ToFile( "OUTDIR_FOR_BUILD", $OUTDIR, "e" ); ToFile( "PATH_FOR_BUILD", $PATH, "e" ); ToFile( "SOLARINC_FOR_BUILD", $SOLARINC, "e" ); diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 03c8f37bc9d9..54bd7913c64c 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -297,7 +297,7 @@ endif endef -ifeq ($(SYSTEM_LIBXSLT),YES) +ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES) gb_XSLTPROCTARGET := gb_XSLTPROC := xsltproc else |