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 /external/mingw-externals | |
| parent | configure: add vars for Solaris/SPARC64 (already checked in vcl) (diff) | |
| download | core-eca3dec2047bf675932cc9a6b2ad8acaaf919a24.tar.gz core-eca3dec2047bf675932cc9a6b2ad8acaaf919a24.zip | |
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 'external/mingw-externals')
| -rw-r--r-- | external/mingw-externals/CustomTarget_jawt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/mingw-externals/CustomTarget_jawt.mk b/external/mingw-externals/CustomTarget_jawt.mk index 2d35d93a24c2..1fb5fa872eb2 100644 --- a/external/mingw-externals/CustomTarget_jawt.mk +++ b/external/mingw-externals/CustomTarget_jawt.mk @@ -14,7 +14,7 @@ $(eval $(call gb_CustomTarget_register_targets,external/jawt,\ libjawt.dll.a \ )) -ifeq ($(OS)$(CPU),WNTX) +ifeq ($(OS)-$(CPUNAME),WNT-X86_64) $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) echo EXPORTS > $@ |