diff options
| -rw-r--r-- | connectivity/Module_connectivity.mk | 2 | ||||
| -rwxr-xr-x | external/jpeg-turbo/ExternalProject_jpeg-turbo.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 97310d128914..1ba9e7bd3a20 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -102,7 +102,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -ifeq ($(OS)-$(CPU),WNT-INTEL) +ifeq ($(OS)-$(CPUNAME),WNT-INTEL) ifneq ($(WITH_MOZAB4WIN),) $(eval $(call gb_Module_add_targets,connectivity,\ diff --git a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk index ad35a6f6c000..c913d70ca662 100755 --- a/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk +++ b/external/jpeg-turbo/ExternalProject_jpeg-turbo.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,jpeg-turbo,build) : $(call gb_Externa $(call gb_ExternalProject_get_state_target,jpeg-turbo,configure) : $(call gb_ExternalProject_run,configure,\ MAKE=$(MAKE) ./configure \ - --build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPU)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \ + --build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \ --with-pic \ --enable-static \ --disable-shared \ |