diff options
| author | Thomas Collerton <tom.coll91@gmail.com> | 2012-05-09 01:22:29 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-05-09 16:31:31 +0200 |
| commit | 9520dbf59f6bd6c86791954e082488556a610adc (patch) | |
| tree | b898c1539aa58e5f57f33ce606da4d27480e4f69 /sal | |
| parent | d7f5dcbc413b4bf89a70fc25a20533323840b63c (diff) | |
EasyHack fdo#42783: get rid of CPU define/build system variable
Change-Id: I6a178f7ff9c8306e15bcfa847ad1e5e4f8476504
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/Library_sal.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 0b6e30f55e06..adbe80344048 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -198,7 +198,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ sal/osl/unx/osxlocale \ )) endif -ifneq ($(filter $(OS),SOLARIS FREEBSD NETBSD MACOSX AIX OPENBSD DRAGONFLY)$(filter $(OS)$(CPU),LINUXS),) +ifneq ($(filter $(OS),SOLARIS FREEBSD NETBSD MACOSX AIX OPENBSD DRAGONFLY)$(filter $(OS)$(CPUNAME),LINUXSPARC),) $(eval $(call gb_Library_add_cobjects,sal,\ sal/osl/unx/backtrace \ )) @@ -207,7 +207,7 @@ ifneq ($(filter $(OS)$(CPU),SOLARISU SOLARISS NETBSDS LINUXS),) $(eval $(call gb_Library_add_asmobjects,sal,\ sal/osl/unx/asm/interlck_sparc \ )) -else ifeq ($(OS)$(CPU),SOLARISI) +else ifeq ($(OS)$(CPUNAME),SOLARISINTEL) $(eval $(call gb_Library_add_asmobjects,sal,\ sal/osl/unx/asm/interlck_x86 \ )) |