Drop symlink common/develop/tools/current
* drop the symlink itself (system development tools are now symlinked from /boot/common/bin directly) * remove that symlink from PATH
This commit is contained in:
@@ -493,11 +493,6 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
|
|||||||
InstallOptionalHaikuImagePackage
|
InstallOptionalHaikuImagePackage
|
||||||
$(hpkgBaseURL)/gcc-2.95.3_130421-1-x86_gcc2.hpkg
|
$(hpkgBaseURL)/gcc-2.95.3_130421-1-x86_gcc2.hpkg
|
||||||
: common packages ;
|
: common packages ;
|
||||||
|
|
||||||
# TODO: remove this when we have a mechanism to switch gcc via PATH
|
|
||||||
AddSymlinkToHaikuImage common settings develop tools
|
|
||||||
: /boot/common/develop/tools/gcc-2.95.3-110711
|
|
||||||
: current ;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if $(HAIKU_GCC_VERSION[1]) = 4 {
|
if $(HAIKU_GCC_VERSION[1]) = 4 {
|
||||||
|
|||||||
@@ -8,9 +8,6 @@ export LC_CTYPE="en_US.UTF-8"
|
|||||||
|
|
||||||
BUILDHOME=/boot/system/develop
|
BUILDHOME=/boot/system/develop
|
||||||
|
|
||||||
#TODO: fix this or drop it!
|
|
||||||
BETOOLS="/boot/common/settings/develop/tools/current/bin"
|
|
||||||
|
|
||||||
case `uname -m` in
|
case `uname -m` in
|
||||||
BePC|Intel|unknown)
|
BePC|Intel|unknown)
|
||||||
BE_HOST_CPU=x86
|
BE_HOST_CPU=x86
|
||||||
@@ -29,7 +26,6 @@ BH=$BUILDHOME/headers
|
|||||||
BEINCLUDES="$BH;$BH/be;$BH/posix;$BH/glibc;$BH/cpp;$BH/be/app;$BH/be/device;$BH/be/interface;$BH/be/locale;$BH/be/media;$BH/be/midi;$BH/be/midi2;$BH/be/net;$BH/be/kernel;$BH/be/storage;$BH/be/support;$BH/be/game;$BH/be/opengl;$BH/be/drivers;$BH/gnu;$BH/be/mail;$BH/be/translation;$BH/be/devel;$BH/be/add-ons/graphics;$BH/be/be_apps/Deskbar;$BH/be/be_apps/NetPositive;$BH/be/be_apps/Tracker"
|
BEINCLUDES="$BH;$BH/be;$BH/posix;$BH/glibc;$BH/cpp;$BH/be/app;$BH/be/device;$BH/be/interface;$BH/be/locale;$BH/be/media;$BH/be/midi;$BH/be/midi2;$BH/be/net;$BH/be/kernel;$BH/be/storage;$BH/be/support;$BH/be/game;$BH/be/opengl;$BH/be/drivers;$BH/gnu;$BH/be/mail;$BH/be/translation;$BH/be/devel;$BH/be/add-ons/graphics;$BH/be/be_apps/Deskbar;$BH/be/be_apps/NetPositive;$BH/be/be_apps/Tracker"
|
||||||
|
|
||||||
export BUILDHOME
|
export BUILDHOME
|
||||||
export BETOOLS
|
|
||||||
export BELIBRARIES
|
export BELIBRARIES
|
||||||
export BEINCLUDES
|
export BEINCLUDES
|
||||||
export BE_HOST_CPU
|
export BE_HOST_CPU
|
||||||
@@ -44,11 +40,11 @@ export BE_DEFAULT_CPLUS_FLAGS=""
|
|||||||
|
|
||||||
if [ "$SAFEMODE" != "yes" ]
|
if [ "$SAFEMODE" != "yes" ]
|
||||||
then
|
then
|
||||||
export PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/common/non-packaged/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences:$BETOOLS
|
export PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/common/non-packaged/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences
|
||||||
export LIBRARY_PATH="%A/lib:$HOME/config/non-packaged/lib:$HOME/config/lib:/boot/common/non-packaged/lib:/boot/common/lib:/boot/system/lib"
|
export LIBRARY_PATH="%A/lib:$HOME/config/non-packaged/lib:$HOME/config/lib:/boot/common/non-packaged/lib:/boot/common/lib:/boot/system/lib"
|
||||||
export ADDON_PATH="%A/add-ons:$HOME/config/non-packaged/add-ons:$HOME/config/add-ons:/boot/common/non-packaged/add-ons:/boot/common/add-ons:/boot/system/add-ons"
|
export ADDON_PATH="%A/add-ons:$HOME/config/non-packaged/add-ons:$HOME/config/add-ons:/boot/common/non-packaged/add-ons:/boot/common/add-ons:/boot/system/add-ons"
|
||||||
else
|
else
|
||||||
export PATH=.:/bin:/boot/apps:/boot/system/apps:/boot/system/preferences:$BETOOLS
|
export PATH=.:/bin:/boot/apps:/boot/system/apps:/boot/system/preferences
|
||||||
export LIBRARY_PATH="%A/lib:/boot/system/lib"
|
export LIBRARY_PATH="%A/lib:/boot/system/lib"
|
||||||
export ADDON_PATH="%A/add-ons:/boot/system/add-ons"
|
export ADDON_PATH="%A/add-ons:/boot/system/add-ons"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -56,8 +56,7 @@
|
|||||||
#define DEFAULT_PATH_VALUE \
|
#define DEFAULT_PATH_VALUE \
|
||||||
".:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences" \
|
".:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences" \
|
||||||
":/boot/system/apps" \
|
":/boot/system/apps" \
|
||||||
":/boot/system/preferences" \
|
":/boot/system/preferences"
|
||||||
":/boot/common/settings/develop/tools/current/bin"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The value for PATH when invoking `command -p'. This is only used when
|
/* The value for PATH when invoking `command -p'. This is only used when
|
||||||
|
|||||||
Reference in New Issue
Block a user