diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-06 18:59:45 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-07 01:34:43 +0100 |
| commit | eca3dec2047bf675932cc9a6b2ad8acaaf919a24 (patch) | |
| tree | 6adb76a0d80afbbdac72f1d194535d4573fbfb35 /bridges/Module_bridges.mk | |
| parent | 9487456637abc1f26eda26f9e38f260b5f49edc2 (diff) | |
fdo#42783: remove CPU variable from environment
Replace uses with CPUNAME instead, and get rid of the horrible
postgresql patch that worked around environment leakage.
Change-Id: I38ccabfc438360524a272901bb9332ea708e274c
Diffstat (limited to 'bridges/Module_bridges.mk')
| -rw-r--r-- | bridges/Module_bridges.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk index 6c4e3bf6bd3a..534efda6936b 100644 --- a/bridges/Module_bridges.mk +++ b/bridges/Module_bridges.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Module_add_targets,bridges,\ Library_java_uno \ $(if $(filter MACOSX,$(OS)),Package_jnilib_java_uno) \ ) \ - $(if $(filter R,$(CPU)),\ + $(if $(filter ARM,$(CPUNAME)),\ $(if $(filter IOS,$(OS)),\ CustomTarget_gcc3_ios_arm) \ $(if $(filter ANDROID LINUX,$(OS)),\ |