diff options
| author | Vinson Lee <vlee@vmware.com> | 2011-03-09 16:25:49 -0800 |
|---|---|---|
| committer | Vinson Lee <vlee@vmware.com> | 2011-03-09 16:25:49 -0800 |
| commit | c9365dcda8f780089066392c81328ea8d68b6fb0 (patch) | |
| tree | b5a743a34b6e6bea41433f131029c659e755f387 | |
| parent | e6e3868e7c805efcbbf70958d37325079d4e3038 (diff) | |
cmake: Only build i386 glean on Mac OS X.
glean on Mac OS X can currently only be built as 32-bit.
The Mac OS X build use to work but sometime recently the -m32 flag
stopped being passed to the compiler or linker. This patch uses
CMAKE_OSX_ARCHITECTURES instead of trying to pass -m32 by setting the
flags.
| -rw-r--r-- | tests/glean/CMakeLists.gl.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/glean/CMakeLists.gl.txt b/tests/glean/CMakeLists.gl.txt index 4bc53fa83..82648658a 100644 --- a/tests/glean/CMakeLists.gl.txt +++ b/tests/glean/CMakeLists.gl.txt @@ -3,8 +3,7 @@ if (MSVC) ELSEIF (APPLE) add_definitions ( -D__AGL__ -D__UNIX__ ) FIND_LIBRARY(CARBON_LIBRARY Carbon) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32") + SET(CMAKE_OSX_ARCHITECTURES i386) ELSE () add_definitions ( -D__X11__ -D__UNIX__ ) ENDIF () |