diff options
| author | Peter Andersson <[email protected]> | 2015-03-18 11:08:28 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2015-03-18 11:08:28 +0100 |
| commit | ae42a30d17367c0c52a057230c18179dcda539bb (patch) | |
| tree | bc00ad3e859b8c48810ba7f5b156565e79c89a0d /xcomp | |
| parent | ccf75f6d855b02e2241223c65ee924562686ac49 (diff) | |
| parent | fcd42a374f5bee6693737a3ff7276b6694a930f2 (diff) | |
| download | otp-ae42a30d17367c0c52a057230c18179dcda539bb.tar.gz otp-ae42a30d17367c0c52a057230c18179dcda539bb.tar.bz2 otp-ae42a30d17367c0c52a057230c18179dcda539bb.zip | |
Merge remote-tracking branch 'origin/peppe/fix_xcomp' into maint
* origin/peppe/fix_xcomp:
Modify the xcomp file for ARM and enable more flags
Fix problem with variables not getting assigned during installation
OTP-11441
Diffstat (limited to 'xcomp')
| -rw-r--r-- | xcomp/erl-xcomp-arm-linux.conf | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/xcomp/erl-xcomp-arm-linux.conf b/xcomp/erl-xcomp-arm-linux.conf index 76912d25e0..6656c1a1aa 100644 --- a/xcomp/erl-xcomp-arm-linux.conf +++ b/xcomp/erl-xcomp-arm-linux.conf @@ -74,7 +74,8 @@ erl_xcomp_configure_flags="--disable-hipe" CC="arm-wrs-linux-gnueabi-gcc --sysroot=$ARM_SYSROOT" # * `CFLAGS' - C compiler flags. -#CFLAGS="-O@OPT_LEVEL@ -DSMALL_MEMORY" +CFLAGS="-O2 -DSMALL_MEMORY --sysroot=$ARM_SYSROOT -Wall -g" + # * `STATIC_CFLAGS' - Static C compiler flags. #STATIC_CFLAGS= @@ -87,19 +88,19 @@ CC="arm-wrs-linux-gnueabi-gcc --sysroot=$ARM_SYSROOT" CPP="arm-wrs-linux-gnueabi-cpp --sysroot=$ARM_SYSROOT" # * `CPPFLAGS' - C pre-processor flags. -#CPPFLAGS="--sysroot=$ARM_SYSROOT" +CPPFLAGS="--sysroot=$ARM_SYSROOT" # * `CXX' - C++ compiler. CXX="arm-wrs-linux-gnueabi-c++ --sysroot=$ARM_SYSROOT" # * `CXXFLAGS' - C++ compiler flags. -#CXXFLAGS= +CXXFLAGS="--sysroot=$ARM_SYSROOT" # * `LD' - Linker. -#LD= +LD="arm-wrs-linux-gnueabi-gcc" # * `LDFLAGS' - Linker flags. -#LDFLAGS= +LDFLAGS="--sysroot=$ARM_SYSROOT" # * `LIBS' - Libraries. #LIBS= @@ -109,14 +110,14 @@ CXX="arm-wrs-linux-gnueabi-c++ --sysroot=$ARM_SYSROOT" ## *NOTE*! Either set all or none of the `DED_LD*' variables. # * `DED_LD' - Linker for Dynamically loaded Erlang Drivers. -#DED_LD= +DED_LD="arm-wrs-linux-gnueabi-gcc" # * `DED_LDFLAGS' - Linker flags to use with `DED_LD'. -#DED_LDFLAGS= +DED_LDFLAGS="--sysroot=$ARM_SYSROOT -shared -Wl,-Bsymbolic" # * `DED_LD_FLAG_RUNTIME_LIBRARY_PATH' - This flag should set runtime library # search path for shared libraries when linking with `DED_LD'. -#DED_LD_FLAG_RUNTIME_LIBRARY_PATH= +DED_LD_FLAG_RUNTIME_LIBRARY_PATH="-Wl,-R" ## -- Large File Support -- |