diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-24 22:56:33 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-24 22:56:48 +0200 |
| commit | d03465a44618e1158acd63cb5ab6a39b4e2778a2 (patch) | |
| tree | f4bd2c4fd68a27afd1a88f0693d43348f1b00224 /solenv/gbuild | |
| parent | e817dcce778e7fad347d68532653d24903774a9d (diff) | |
Undo basis/brand split: removed RPATH BRAND (same as OOO now).
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/Helper.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/ios.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 2 |
5 files changed, 1 insertions, 8 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index bffaf8aeb273..8214468f02c3 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -97,7 +97,7 @@ $(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo))) endef define gb_Helper_init_registries -gb_Executable_VALIDGROUPS := UREBIN SDK OOO BRAND NONE +gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS gb_StaticLibrary_VALIDGROUPS := PLAINLIBS diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk index a131a8accc78..8d3fec8b0d02 100644 --- a/solenv/gbuild/platform/ios.mk +++ b/solenv/gbuild/platform/ios.mk @@ -368,7 +368,6 @@ gb_Executable_LAYER := \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):OOO) \ $(foreach exe,$(gb_Executable_SDK),$(exe):OOO) \ $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ - $(foreach exe,$(gb_Executable_BRAND),$(exe):OOO) \ $(foreach exe,$(gb_Executable_NONE),$(exe):OOO) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 37adf1bc01dd..936b27ca5d30 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -277,7 +277,6 @@ gb_LinkTarget__RPATHS := \ URELIB:@__________________________________________________URELIB/ \ UREBIN: \ OOO:@__________________________________________________OOO/ \ - BRAND: \ SDKBIN: \ NONE:@__VIA_LIBRARY_PATH__@ \ @@ -457,7 +456,6 @@ gb_Executable_LAYER := \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ - $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \ $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index b4627a1e533d..163a25791e40 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -191,7 +191,6 @@ gb_LinkTarget__RPATHS := \ URELIB:\dORIGIN \ UREBIN:\dORIGIN/../lib:\dORIGIN \ OOO:\dORIGIN:\dORIGIN/../ure-link/lib \ - BRAND:\dORIGIN:\dORIGIN/../ure-link/lib \ SDKBIN:\dORIGIN/../../ure-link/lib \ NONE:\dORIGIN/../lib:\dORIGIN \ @@ -326,7 +325,6 @@ gb_Executable_LAYER := \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ - $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \ $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 27d67614c4c8..e3e168d02b1d 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -306,7 +306,6 @@ gb_LinkTarget__RPATHS := \ URELIB:\dORIGIN \ UREBIN:\dORIGIN/../lib:\dORIGIN \ OOO:\dORIGIN:\dORIGIN/../ure-link/lib \ - BRAND:\dORIGIN:\dORIGIN/../ure-link/lib \ SDKBIN:\dORIGIN/../../ure-link/lib \ NONE:\dORIGIN/../lib:\dORIGIN \ @@ -446,7 +445,6 @@ gb_Executable_LAYER := \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ - $(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \ $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \ |