diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 11:07:48 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 11:07:48 +0000 |
| commit | a57f89db319c1fb8882c80ccf438382dab77cf3a (patch) | |
| tree | febb3d703f66c7151ff4c42506913061d740c1b4 /odk | |
| parent | f8daa3c810619864a3f3a825d04d7ea092620e18 (diff) | |
INTEGRATION: CWS sdkbugfix01 (1.2.6); FILE MERGED
2005/02/17 13:46:52 jsc 1.2.6.1: #i42926# set GXX_INCLUDE_PATH for gcc, necessary for stl includes
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/setsdkenv_unix.csh.in | 9 | ||||
| -rw-r--r-- | odk/setsdkenv_unix.sh.in | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in index 00925c88a3cf..45455af8d54f 100644 --- a/odk/setsdkenv_unix.csh.in +++ b/odk/setsdkenv_unix.csh.in @@ -75,6 +75,9 @@ switch (`uname -s`) endif breaksw case "Linux": + set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` + setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path} + set directoryname=linux set exampleout=LINUXexample.out set platform=Linux @@ -87,6 +90,9 @@ switch (`uname -s`) endif breaksw case "Darwin": + set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` + setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path} + set directoryname=macosx set exampleout=MACOSXexample.out set platform=MacOSX @@ -99,6 +105,9 @@ switch (`uname -s`) endif breaksw case "FreeBSD": + set sdk_gxx_include_path=`echo "#include <cstring>" | ${OO_SDK_CPP_HOME}/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` + setenv SDK_GXX_INCLUDE_PATH ${sdk_gxx_include_path} + set directoryname=freebsd set exampleout=FREEBSDexample.out set platform=FreeBSD diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in index 17a2593d9988..fd24904f4624 100644 --- a/odk/setsdkenv_unix.sh.in +++ b/odk/setsdkenv_unix.sh.in @@ -97,6 +97,9 @@ case $sd_platform in ;; Darwin) + SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` + export SDK_GXX_INCLUDE_PATH + directoryname=macosx exampleout=MACOSXexample.out platform=MacOSX @@ -105,6 +108,9 @@ case $sd_platform in ;; Linux) + SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` + export SDK_GXX_INCLUDE_PATH + directoryname=linux exampleout=LINUXexample.out platform=Linux @@ -112,6 +118,9 @@ case $sd_platform in export LD_LIBRARY_PATH ;; FreeBSD) + SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` + export SDK_GXX_INCLUDE_PATH + directoryname=freebsd exampleout=FREEBSDexample.out platform=FreeBSD |