Permalink
Browse files

Fix Mac package build failure

Fixes a Mac package build failure from the update to DR in 81ffd13 that
resulted in 64-bit builds being enabled for Mac.

Review-URL: https://codereview.appspot.com/274760043
  • Loading branch information...
derekbruening committed Oct 16, 2015
1 parent 927b64c commit 9deb266875825e795c7115f7f5c75ace6cefbd71
Showing with 5 additions and 9 deletions.
  1. +5 −9 package.cmake
View
@@ -48,12 +48,6 @@ set(arg_preload "") # cmake file to include prior to each 32-bit build
set(arg_preload64 "") # cmake file to include prior to each 64-bit build
set(arg_use_nmake OFF) # use nmake even if gnu make is present
set(arg_cpackappend "")# string to append to CPackConfig.cmake before packaging
set(arg_32_only OFF) # do not include 64-bit
if (APPLE)
# DRi#58: core DR does not yet support 64-bit Mac
set(arg_32_only ON)
endif ()
foreach (arg ${CTEST_SCRIPT_ARG})
if (${arg} MATCHES "^build=")
@@ -90,9 +84,6 @@ foreach (arg ${CTEST_SCRIPT_ARG})
${arg} MATCHES "^drmemory_only")
set(arg_drmem_only ON)
endif ()
if (${arg} MATCHES "^32_only")
set(arg_32_only ON)
endif ()
endforeach (arg)
if ("${arg_build}" STREQUAL "")
@@ -125,6 +116,11 @@ else ()
include("${runsuite_include_path}/runsuite_common_pre.cmake")
endif ()
if (APPLE)
# DRi#58: core DR does not yet support 64-bit Mac
set(arg_32_only ON)
endif ()
# i#1099: be sure to set BUILDING_PACKAGE
set(base_cache "
${DR_entry}

0 comments on commit 9deb266

Please sign in to comment.