diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2014-03-26 19:21:20 +0000 |
|---|---|---|
| committer | <> | 2014-05-08 15:03:54 +0000 |
| commit | fb123f93f9f5ce42c8e5785d2f8e0edaf951740e (patch) | |
| tree | c2103d76aec5f1f10892cd1d3a38e24f665ae5db /kBuild/header.kmk | |
| parent | 58ed4748338f9466599adfc8a9171280ed99e23f (diff) | |
| download | VirtualBox-master.tar.gz | |
Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master
Diffstat (limited to 'kBuild/header.kmk')
| -rw-r--r-- | kBuild/header.kmk | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/kBuild/header.kmk b/kBuild/header.kmk index 557686e5..852c1a61 100644 --- a/kBuild/header.kmk +++ b/kBuild/header.kmk @@ -1,4 +1,4 @@ -# $Id: header.kmk 2624 2012-08-05 17:09:27Z bird $ +# $Id: header.kmk 2689 2013-07-11 21:31:43Z bird $ ## @file # kBuild - File included at top of a makefile. # @@ -79,7 +79,7 @@ endif # The revision in which this file was last modified. # This can be useful when using development versions of kBuild. # -KMK_REVISION := $(patsubst %:,, $Rev: 2624 $ ) +KMK_REVISION := $(patsubst %:,, $Rev: 2689 $ ) # @@ -1276,10 +1276,17 @@ else if1of ($(KBUILD_TARGET), freebsd netbsd openbsd dragonfly) KBUILD_LIB_SEARCH_SUBS := lib/ else ifeq ($(KBUILD_TARGET),linux) - KBUILD_LIB_SEARCH_ROOTS := \ - / \ - /usr/ \ - /usr/local/ + ifeq ($(realpath /bin),/usr/bin) + KBUILD_LIB_SEARCH_ROOTS := \ + /usr/ \ + / \ + /usr/local/ + else + KBUILD_LIB_SEARCH_ROOTS := \ + / \ + /usr/ \ + /usr/local/ + endif ifeq ($(KBUILD_TARGET_ARCH),amd64) KBUILD_LIB_SEARCH_SUBS := \ lib/x86_64-linux-gnu/ \ @@ -1562,6 +1569,6 @@ endif # end-of-file-content __header_kmk__ := 1 -endif # __header_kmk__ +endif # !__header_kmk__ |