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 | |
parent | removed unused defines (diff) | |
download | core-9520dbf59f6bd6c86791954e082488556a610adc.tar.gz core-9520dbf59f6bd6c86791954e082488556a610adc.zip |
EasyHack fdo#42783: get rid of CPU define/build system variable
Change-Id: I6a178f7ff9c8306e15bcfa847ad1e5e4f8476504
-rw-r--r-- | basic/Library_sb.mk | 8 | ||||
-rw-r--r-- | cairo/cairo/makefile.mk | 2 | ||||
-rw-r--r-- | cairo/pixman/makefile.mk | 2 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | curl/makefile.mk | 2 | ||||
-rw-r--r-- | icu/makefile.mk | 2 | ||||
-rw-r--r-- | nss/makefile.mk | 6 | ||||
-rw-r--r-- | odk/util/makefile.pmk | 4 | ||||
-rw-r--r-- | postprocess/rebase/makefile.mk | 2 | ||||
-rw-r--r-- | python/makefile.mk | 4 | ||||
-rw-r--r-- | reportbuilder/util/makefile.pmk | 2 | ||||
-rw-r--r-- | sal/Library_sal.mk | 4 | ||||
-rw-r--r-- | salhelper/test/rtti/makefile.mk | 2 | ||||
-rw-r--r-- | setup_native/scripts/source/makefile.mk | 4 |
14 files changed, 24 insertions, 24 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 \ )) diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 16a89bfad9a4..43f7b8f186a9 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -156,7 +156,7 @@ LDFLAGS:=$(cairo_LDFLAGS) cairo_CFLAGS+=-xc99=none .ENDIF -.IF "$(CPU)"=="I" +.IF "$(CPUNAME)"=="INTEL" cairo_CFLAGS+=-march=i486 .ENDIF diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index 307f85212aff..a584b520de94 100644 --- a/cairo/pixman/makefile.mk +++ b/cairo/pixman/makefile.mk @@ -117,7 +117,7 @@ LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ld pixman_CFLAGS+=-xc99=none .ENDIF -.IF "$(CPU)"=="I" +.IF "$(CPUNAME)"=="INTEL" pixman_CFLAGS+=-march=i486 .ENDIF diff --git a/configure.in b/configure.in index 8e374855cbbe..c471e34c58dd 100644 --- a/configure.in +++ b/configure.in @@ -2995,8 +2995,8 @@ darwin*) ;; powerpc*) CPU=P - CPUNAME="POWERPC" - OUTPATH="unxmacxp" + CPUNAME=POWERPC + OUTPATH=unxmacxp ;; i*86|x86_64) CPU=I diff --git a/curl/makefile.mk b/curl/makefile.mk index 3eabe724b8cc..97a183566f59 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -140,7 +140,7 @@ EXCFLAGS="/EHsc /YX" BUILD_DIR=.$/lib -.IF "$(CPU)" == "I" +.IF "$(CPUNAME)" == "INTEL" MACHINE=X86 .ELSE MACHINE=X64 diff --git a/icu/makefile.mk b/icu/makefile.mk index 35d847d1fb46..9cc4905dcc26 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -283,7 +283,7 @@ ICU_BUILD_VERSION=Release ICU_BUILD_LIBPOST= .ENDIF -.IF "$(CPU)" == "I" +.IF "$(CPUNAME)" == "INTEL" ICU_BUILD_ARCH=Win32 .ELSE ICU_BUILD_ARCH=x64 diff --git a/nss/makefile.mk b/nss/makefile.mk index 2a1dd0f804be..4e8dd9de8464 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -76,15 +76,15 @@ CONFIGURE_ACTION=mozilla/nsprpub/configure --prefix=$(my_prefix) --includedir=$( # force 64-bit buildmode USE_64:=1 .EXPORT : USE_64 -.ENDIF # "$(CPU)"=="X" +.ENDIF # "$(CPUNAME)"=="X86_64" .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="FREEBSDGCC" -.IF "$(CPU)"=="X" +.IF "$(CPUNAME)"=="X86_64" # force 64-bit buildmode USE_64:=1 .EXPORT : USE_64 -.ENDIF # "$(CPU)"=="X" +.ENDIF # "$(CPUNAME)"=="X86_64" .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)"=="MACOSX" diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 583f33a9ed49..3ffb45ccf216 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -114,7 +114,7 @@ MY_DLLPOSTFIX=.so MY_DLLOUT=$(OUT)/lib DLLOUT=$(SOLARLIBDIR) -.IF "$(OS)$(CPU)"=="SOLARISS" +.IF "$(OS)$(CPUNAME)"=="SOLARISSPARC" # SOLARIS SPARC DESTPLATFROM=solsparc @@ -122,7 +122,7 @@ DESTPLATFROM=solsparc # SOLARIS SPARC 64 DESTPLATFROM=solsparc64 -.ELIF "$(OS)$(CPU)"=="SOLARISI" +.ELIF "$(OS)$(CPUNAME)"=="SOLARISINTEL" # SOLARIS INTEL DESTPLATFROM=solintel diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk index a6a2eb94ca18..c5d76158005c 100644 --- a/postprocess/rebase/makefile.mk +++ b/postprocess/rebase/makefile.mk @@ -44,7 +44,7 @@ IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll ALLTAR : REBASE REBASE .PHONY : $(BASEADDRESSES) -.IF "$(GUI)$(COM)$(CPU)"=="WNTMSCI" +.IF "$(GUI)$(COM)$(CPUNAME)"=="WNTMSCINTEL" .IF "$(product)"=="full" $(PERL) rebase.pl -C $(BASEADDRESSES) -b $(STARTADDRESS) -d -e 10000 -l $(LOGFILE) -m $(MISC) -v -R $(SOLARBINDIR) -N $(EXCLUDELIST) $(IMAGENAMES) .ELSE # "$(product)"=="full" diff --git a/python/makefile.mk b/python/makefile.mk index 5043b28f3ef3..874fd4ff2a96 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -98,7 +98,7 @@ my_prefix = python-inst CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=/$(my_prefix) --enable-shared CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)" -.IF "$(OS)$(CPU)" == "SOLARISI" +.IF "$(OS)$(CPUNAME)" == "SOLARISINTEL" CONFIGURE_ACTION += --disable-ipv6 .ENDIF @@ -147,7 +147,7 @@ BUILD_DIR=PC/VS7.1 BUILD_DIR=PC/VC6 .ENDIF -.IF "$(CPU)" == "I" +.IF "$(CPUNAME)" == "INTEL" ARCH=Win32 .ELSE ARCH=x64 diff --git a/reportbuilder/util/makefile.pmk b/reportbuilder/util/makefile.pmk index 566132247f9f..7e2b2dcfd1e0 100644 --- a/reportbuilder/util/makefile.pmk +++ b/reportbuilder/util/makefile.pmk @@ -59,7 +59,7 @@ LOCALIDLFILES=TRUE URDDOC=TRUE .IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" -.IF "$(CPU)"=="I" +.IF "$(CPUNAME)"=="INTEL" UNOIDL=unoidl .ENDIF .ENDIF 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 \ )) diff --git a/salhelper/test/rtti/makefile.mk b/salhelper/test/rtti/makefile.mk index e87182c4e9ea..9ee8a8860957 100644 --- a/salhelper/test/rtti/makefile.mk +++ b/salhelper/test/rtti/makefile.mk @@ -71,7 +71,7 @@ DEF1EXPORTFILE= exports.dxp DEF1NAME= $(SHL1TARGET) -.IF "$(OS)$(CPU)"=="SOLARISS" +.IF "$(OS)$(CPUNAME)"=="SOLARISSPARC" SHL1VERSIONMAP= sols.map .ENDIF diff --git a/setup_native/scripts/source/makefile.mk b/setup_native/scripts/source/makefile.mk index 6933f53d6149..60c84e80e797 100644 --- a/setup_native/scripts/source/makefile.mk +++ b/setup_native/scripts/source/makefile.mk @@ -53,7 +53,7 @@ CFLAGS+=-D_GNU_SOURCE .ENDIF .IF "$(OS)" == "SOLARIS" -.IF "$(CPU)" == "I" +.IF "$(CPUNAME)" == "INTEL" .IF "$(COM)" != "GCC" CFLAGS+=-D_KERNEL .ENDIF @@ -65,7 +65,7 @@ CFLAGS+=-D_KERNEL # 64 bit builds .IF "$(OS)" == "SOLARIS" .IF "$(COM)" != "GCC" -.IF "$(CPU)" == "S" +.IF "$(CPUNAME)" == "SPARC" ENVCFLAGS=-xarch=v8 .ENDIF .IF "$(CPU)"=="U" |