Use CPATH in dev environment This should work when compiling as C++.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/6a69caef Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/6a69caef Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/6a69caef Branch: refs/heads/master Commit: 6a69caef19de2bf393a4912a3adf92c883c3c2a4 Parents: 5fbb175 Author: Nick Wellnhofer <[email protected]> Authored: Thu Jul 31 22:56:50 2014 +0200 Committer: Nick Wellnhofer <[email protected]> Committed: Thu Jul 31 22:56:50 2014 +0200 ---------------------------------------------------------------------- devel/bin/setup_env.bat | 6 +++--- devel/bin/setup_env.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/6a69caef/devel/bin/setup_env.bat ---------------------------------------------------------------------- diff --git a/devel/bin/setup_env.bat b/devel/bin/setup_env.bat index dd734c7..2619319 100644 --- a/devel/bin/setup_env.bat +++ b/devel/bin/setup_env.bat @@ -29,8 +29,8 @@ call :add_to_path "%PATH%" "%runtime_dir%\c" set PATH=%retval% call :add_to_path "%INCLUDE%" "%runtime_dir%\perl\xs" set INCLUDE=%retval% -call :add_to_path "%C_INCLUDE_PATH%" "%runtime_dir%\perl\xs" -set C_INCLUDE_PATH=%retval% +call :add_to_path "%CPATH%" "%runtime_dir%\perl\xs" +set CPATH=%retval% call :add_to_path "%LIB%" "%runtime_dir%\c" set LIB=%retval% call :add_to_path "%CLOWNFISH_INCLUDE%" "%runtime_dir%\core" @@ -47,7 +47,7 @@ set PERL5LIB=%retval% endlocal & ( set "PATH=%PATH%" set "INCLUDE=%INCLUDE%" - set "C_INCLUDE_PATH=%C_INCLUDE_PATH%" + set "CPATH=%CPATH%" set "LIB=%LIB%" set "CLOWNFISH_INCLUDE=%CLOWNFISH_INCLUDE%" set "PERL5LIB=%PERL5LIB%" http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/6a69caef/devel/bin/setup_env.sh ---------------------------------------------------------------------- diff --git a/devel/bin/setup_env.sh b/devel/bin/setup_env.sh index 377e62c..f943772 100644 --- a/devel/bin/setup_env.sh +++ b/devel/bin/setup_env.sh @@ -19,7 +19,7 @@ # an uninstalled Clownfish source tree. Useful for development. # # - PATH -# - C_INCLUDE_PATH +# - CPATH # - LIBRARY_PATH # - LD_LIBRARY_PATH # - CLOWNFISH_INCLUDE @@ -66,7 +66,7 @@ compiler_dir=$base_dir/compiler runtime_dir=$base_dir/runtime export PATH=`add_to_path "$PATH" "$compiler_dir/c"` -export C_INCLUDE_PATH=`add_to_path "$C_INCLUDE_PATH" "$runtime_dir/perl/xs"` +export CPATH=`add_to_path "$CPATH" "$runtime_dir/perl/xs"` export LIBRARY_PATH=`add_to_path "$LIBRARY_PATH" "$runtime_dir/c"` export CLOWNFISH_INCLUDE=`add_to_path "$CLOWNFISH_INCLUDE" "$runtime_dir/core"` export PERL5LIB=`add_to_path "$PERL5LIB" "$compiler_dir/perl/blib/arch"`
