diff options
| -rwxr-xr-x[-rw-r--r--] | build.sh | 10 | ||||
| -rw-r--r-- | src/Native/CMakeLists.txt | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/Native/gen-buildsys-clang.sh | 0 |
3 files changed, 12 insertions, 5 deletions
diff --git a/build.sh b/build.sh index 71bd808ee..1a4f1bd1c 100644..100755 --- a/build.sh +++ b/build.sh @@ -106,11 +106,6 @@ prepare_native_build() # This is where all built CoreClr libraries will copied to. export __CMakeBinDir="$__BinDir" - # Configure environment if we are doing a clean build. - if [ $__CleanBuild == 1 ]; then - clean - fi - # Configure environment if we are doing a verbose build if [ $__VerboseBuild == 1 ]; then export VERBOSE=1 @@ -296,6 +291,11 @@ __BinDir="$__rootbinpath/$__BuildOS.$__BuildArch.$__BuildType/Native" # Make the directories necessary for build if they don't exist +# Configure environment if we are doing a clean build. +if [ $__CleanBuild == 1 ]; then + clean +fi + setup_dirs if $__buildmanaged; then diff --git a/src/Native/CMakeLists.txt b/src/Native/CMakeLists.txt index f3fc58549..f801d2e75 100644 --- a/src/Native/CMakeLists.txt +++ b/src/Native/CMakeLists.txt @@ -41,6 +41,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) set(CLR_CMAKE_PLATFORM_LINUX 1) endif(CMAKE_SYSTEM_NAME STREQUAL Linux) +if(CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(CLR_CMAKE_PLATFORM_UNIX 1) + set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1) + set(CLR_CMAKE_PLATFORM_DARWIN 1) + set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} <FLAGS> <DEFINES> -o <OBJECT> -c <SOURCE>") +endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) + if (CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DPLATFORM_UNIX=1) diff --git a/src/Native/gen-buildsys-clang.sh b/src/Native/gen-buildsys-clang.sh index 9367c3201..9367c3201 100644..100755 --- a/src/Native/gen-buildsys-clang.sh +++ b/src/Native/gen-buildsys-clang.sh |