diff options
| author | Henrik Nord <[email protected]> | 2014-03-21 16:39:02 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2014-03-21 16:39:05 +0100 |
| commit | a4030a89eb9a22d250dba2793f274f8731126ea8 (patch) | |
| tree | 620592b3560f98be67f71f70fd5596cc110ecd70 /erts/etc/common | |
| parent | c9da6c2f06efa410462299a20e10206843082ac8 (diff) | |
| parent | f43a1dc55d42de3097f75ca65baead9a2ff05c78 (diff) | |
| download | otp-a4030a89eb9a22d250dba2793f274f8731126ea8.tar.gz otp-a4030a89eb9a22d250dba2793f274f8731126ea8.tar.bz2 otp-a4030a89eb9a22d250dba2793f274f8731126ea8.zip | |
Merge branch 'fogfish/embedded-arm-android'
* fogfish/embedded-arm-android:
Raspberry PI / Android a minimal cross-compile configuration
OTP-11805
Diffstat (limited to 'erts/etc/common')
| -rw-r--r-- | erts/etc/common/Makefile.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in index 5c2cd8aded..cfd36af962 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in @@ -66,7 +66,9 @@ LIBS = @LIBS@ LDFLAGS = @LDFLAGS@ # For clock_gettime in heart +ifneq ($(TARGET),arm-unknown-linux-androideabi) RTLIBS = @LIBRT@ +endif ifeq ($(TARGET),win32) ifeq ($(TYPE),debug) |