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 /basic | |
| parent | d7f5dcbc413b4bf89a70fc25a20533323840b63c (diff) | |
EasyHack fdo#42783: get rid of CPU define/build system variable
Change-Id: I6a178f7ff9c8306e15bcfa847ad1e5e4f8476504
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/Library_sb.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 352f3e62efd4..acf3996613b3 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -156,12 +156,12 @@ $(eval $(call gb_Library_use_libraries,sb,\ )) endif -ifeq ($(GUI)$(CPU),WNTI) +ifeq ($(GUI)$(CPUNAME),WNTINTEL) $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/runtime/dllmgr-x86 \ )) else -ifeq ($(GUI)$(CPU),WNTX) +ifeq ($(GUI)$(CPUNAME),WNTX86_64) $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/runtime/dllmgr-x64 \ )) @@ -171,12 +171,12 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ )) endif endif -ifeq ($(GUI)$(COM)$(CPU),WNTMSCI) +ifeq ($(GUI)$(COM)$(CPUNAME),WNTMSCINTEL) $(eval $(call gb_Library_add_asmobjects,sb,\ basic/source/runtime/wnt-x86 \ )) endif -ifeq ($(GUI)$(COM)$(CPU),WNTGCCI) +ifeq ($(GUI)$(COM)$(CPUNAME),WNTGCCINTEL) $(eval $(call gb_Library_add_asmobjects,sb,\ basic/source/runtime/wnt-mingw \ )) |