aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2014-01-28 12:45:45 +0100
committerDan Gudmundsson <[email protected]>2014-01-28 12:45:45 +0100
commit2bf4de14f0c606faa1b2fe2ae444ebb8c4ee6590 (patch)
tree544c445e8714057605bc6229e482f2f1ccc5c8ab
parent1ee2ab5ab7ea5be93f52dc9f3769dfd58248550e (diff)
parenta696ae0b0f801303e425f05da411c06e6d9045e8 (diff)
downloadotp-2bf4de14f0c606faa1b2fe2ae444ebb8c4ee6590.tar.gz
otp-2bf4de14f0c606faa1b2fe2ae444ebb8c4ee6590.tar.bz2
otp-2bf4de14f0c606faa1b2fe2ae444ebb8c4ee6590.zip
Merge branch 'dgud/misc'
-rw-r--r--HOWTO/INSTALL.md43
1 files changed, 8 insertions, 35 deletions
diff --git a/HOWTO/INSTALL.md b/HOWTO/INSTALL.md
index 92d6737278..0d5ae3cfbe 100644
--- a/HOWTO/INSTALL.md
+++ b/HOWTO/INSTALL.md
@@ -680,39 +680,11 @@ If you develop linked-in drivers (shared library) you need to link using
include `-fno-common` in `CFLAGS` when compiling. Use `.so` as the library
suffix.
-Use the `--enable-darwin-64bit` configure flag to build a 64-bit
-binaries on Mac OS X.
+Install `Xcode` from the `AppStore` if it is not already installed.
-Building a fast Erlang VM on Mac OS Lion
-----------------------------------------
-
-Starting with Xcode 4.2, Apple no longer includes a "real" `gcc`
-compiler (not based on the LLVM). Building with `llvm-gcc` or `clang`
-will work, but the performance of the Erlang run-time system will not
-be the best possible.
-
-Note that if you have `gcc-4.2` installed and included in `PATH`
-(from a previous version of Xcode), `configure` will automatically
-make sure that `gcc-4.2` will be used to compile `beam_emu.c`
-(the source file most in need of `gcc`).
-
-If you don't have `gcc-4.2.` and want to build a run-time system with
-the best possible performance, do like this:
-
-Install Xcode from the AppStore if it is not already installed.
-
-If you have Xcode 4.3, or later, you will also need to download
+If you have Xcode 4.3, or later, you will also need to download
"Command Line Tools" via the Downloads preference pane in Xcode.
-Some tools may still be lacking or out-of-date, we recommend using
-[Homebrew](https://github.com/mxcl/homebrew/wiki/installation) or
-Macports to update those tools.
-
-Install MacPorts (<http://www.macports.org/>). Then:
-
- $ sudo port selfupdate
- $ sudo port install gcc45 +universal
-
### Building with wxErlang ###
If you want to build the `wx` application, you will need to get wxWidgets-3.0 (or later)
@@ -720,13 +692,14 @@ If you want to build the `wx` application, you will need to get wxWidgets-3.0 (o
or get it from github:
$ git clone [email protected]:wxWidgets/wxWidgets.git
-Be aware that the wxWidgets-3.0 is a new release of wxWidgets, it is not as matured
+Be aware that the wxWidgets-3.0 is a new release of wxWidgets, it is not as matured
as the old releases and the MacOsX port still lags behind the other ports.
-Configure and build wxWidgets:
+Configure and build wxWidgets (on Mavericks - 10.9):
- $ ./configure --with-cocoa --prefix=/usr/local
- % Optional version and static libs: --with-macosx-version-min=10.9 --disable-shared
+ $ ./configure --with-cocoa --prefix=/usr/local
+ or without support for old versions and with static libs
+ $ ./configure --with-cocoa --prefix=/usr/local --with-macosx-version-min=10.9 --disable-shared
$ make
$ sudo make install
$ export PATH=/usr/local/bin:$PATH
@@ -791,7 +764,7 @@ Copyright and License
%CopyrightBegin%
-Copyright Ericsson AB 1998-2013. All Rights Reserved.
+Copyright Ericsson AB 1998-2014. All Rights Reserved.
The contents of this file are subject to the Erlang Public License,
Version 1.1, (the "License"); you may not use this file except in