Skip to content

Commit 2eaa5b7

Browse files
committed
Some flags changes
1 parent 3ba4087 commit 2eaa5b7

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

gettext.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fi
1414

1515
cd gettext-src/gettext-runtime
1616

17-
./configure --host=$TARGET CFLAGS="$CFLAGS" CPPFLAGS="$CXXFLAGS" \
17+
./configure --host="$TARGET" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
1818
--prefix=/ --disable-shared --enable-static \
1919
--disable-libasprintf
2020

harfbuzz.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ cmake .. -DANDROID_STL="c++_static" \
2121
-DBUILD_SHARED_LIBS=FALSE \
2222
-DCMAKE_BUILD_TYPE=Release \
2323
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
24+
-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
2425
-DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
2526
-DFREETYPE_LIBRARY="$ANDR_ROOT/output/freetype/lib/$TARGET_ABI/libfreetype.a $ANDR_ROOT/output/libpng/lib/$TARGET_ABI/libpng.a" \
2627
-DFREETYPE_INCLUDE_DIRS="$ANDR_ROOT/output/freetype/include" \

libcurl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ INCLUDE_DIRS="-I$ANDR_ROOT/output/openssl/include -I$ANDR_ROOT/output/nghttp2/in
1818
LIBRARY_DIRS="-L$ANDR_ROOT/output/openssl/lib/$TARGET_ABI -L$ANDR_ROOT/output/nghttp2/lib/$TARGET_ABI"
1919

2020
CFLAGS="$INCLUDE_DIRS $LIBRARY_DIRS $CFLAGS" \
21-
./configure --host=$TARGET \
21+
./configure --host="$TARGET" \
2222
--with-openssl \
2323
--with-nghttp2 \
2424
--prefix=/ --disable-shared --enable-static \

luajit.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ make amalg -j \
2929
CC="$CC" \
3030
TARGET_AR="$AR rcus" \
3131
TARGET_STRIP="$STRIP" \
32-
TARGET_FLAGS="$CFLAGS_NO_FAST -Wno-undef-prefix" \
3332
BUILDMODE=static
3433

3534
# update `src` folder

openssl.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ fi
1515

1616
cd openssl-src
1717

18-
CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
1918
PATH=$TOOLCHAIN/bin:$PATH
2019
dos2unix Configure
2120
./Configure $TARGET_NAME no-tests no-shared -U__ANDROID_API__ -D__ANDROID_API__=$API

sdk.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ case "$ARCH" in
4141
esac
4242

4343
export API=23
44-
export CFLAGS="-Ofast -flto -fPIC -D__ANDROID_MIN_SDK_VERSION__=$API"
44+
export CFLAGS="-Ofast -flto -fPIC -fvisibility=hidden -D__ANDROID_MIN_SDK_VERSION__=$API"
4545
export CFLAGS_NO_FAST="-O3 -fPIC -D__ANDROID_MIN_SDK_VERSION__=$API"
46-
export CXXFLAGS="$CFLAGS -fexceptions -frtti"
46+
export CXXFLAGS="$CFLAGS -fvisibility-inlines-hidden -fexceptions -frtti"
4747
export NATIVE_API_LEVEL="android-$API"
4848

4949
echo "Configured for $TARGET_ABI"
@@ -64,7 +64,7 @@ esac
6464
export CC=$TOOLCHAIN/bin/$TARGET$API-clang
6565
export CXX=$TOOLCHAIN/bin/$TARGET$API-clang++
6666
export AR=$TOOLCHAIN/bin/llvm-ar
67-
export LD=$TOOLCHAIN/bin/ld
67+
#export LD=$TOOLCHAIN/bin/ld
6868
export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
6969
export STRIP=$TOOLCHAIN/bin/llvm-strip
7070

0 commit comments

Comments
 (0)