Commit 17014e4e authored by Steffen Michels's avatar Steffen Michels

Merge branch 'use-gcc' into 'master'

Update linux and Mac OS environments: use --gc-sections on linux; remove DynLink on both

See merge request !329
parents 4792ca9d 54543adc
Pipeline #30204 passed with stage
in 5 minutes and 45 seconds
......@@ -13,8 +13,7 @@ Version: 1.0
Path: {Application}/Development/iTasks-SDK/Libraries
EnvironmentCompiler: lib/exe/cocl::-dynamics -d
EnvironmentCodeGen: lib/exe/cg
EnvironmentLinker: /usr/bin/gcc::-g|lib/exe/itasks-web-collector
EnvironmentDynLink: lib/exe/cclinker
EnvironmentLinker: /usr/bin/gcc::-g -Wl,--gc-sections|lib/exe/itasks-web-collector
EnvironmentABCOptimise: lib/exe/abcopt
EnvironmentByteCodeGen: lib/exe/bcgen
EnvironmentByteCodeLink: lib/exe/bclink
......
......@@ -14,8 +14,7 @@ Environments
Path: {Application}/Development/iTasks-SDK/Libraries
EnvironmentCompiler: lib/exe/cocl:-dynamics
EnvironmentCodeGen: lib/exe/cg
EnvironmentLinker: lib/exe/linker|lib/exe/itasks-web-collector
EnvironmentDynLink: lib/exe/linker
EnvironmentLinker: /usr/bin/gcc::-Wl,--gc-sections|lib/exe/itasks-web-collector
EnvironmentABCOptimise: lib/exe/abcopt
EnvironmentByteCodeGen: lib/exe/bcgen
EnvironmentByteCodeLink: lib/exe/bclink
......
......@@ -14,8 +14,7 @@ Environments
Path: {Application}/lib/iTasks
EnvironmentCompiler: lib/exe/cocl-tonic:-dynamics -tonic
EnvironmentCodeGen: lib/exe/cg
EnvironmentLinker: lib/exe/linker|lib/exe/itasks-web-collector
EnvironmentDynLink: lib/exe/linker
EnvironmentLinker: /usr/bin/gcc::-Wl,--gc-sections|lib/exe/itasks-web-collector
EnvironmentABCOptimise: lib/exe/abcopt
EnvironmentByteCodeGen: lib/exe/bcgen
EnvironmentByteCodeLink: lib/exe/bclink
......
......@@ -14,8 +14,7 @@ Environments
Path: {Application}/lib/iTasks
EnvironmentCompiler: lib/exe/cocl::-dynamics
EnvironmentCodeGen: lib/exe/cg
EnvironmentLinker: lib/exe/linker|lib/exe/itasks-web-collector
EnvironmentDynLink: lib/exe/linker
EnvironmentLinker: /usr/bin/gcc::-Wl,--gc-sections|lib/exe/itasks-web-collector
EnvironmentABCOptimise: lib/exe/abcopt
EnvironmentByteCodeGen: lib/exe/bcgen
EnvironmentByteCodeLink: lib/exe/bclink
......
......@@ -13,8 +13,7 @@ Version: 1.0
Path: {Application}/lib/iTasks
EnvironmentCompiler: lib/exe/cocl:-dynamics -desc -exl -d
EnvironmentCodeGen: lib/exe/cg
EnvironmentLinker: lib/exe/cclinker|lib/exe/itasks-web-collector
EnvironmentDynLink: lib/exe/cclinker
EnvironmentLinker: /usr/bin/gcc|lib/exe/itasks-web-collector
EnvironmentABCOptimise: lib/exe/abcopt
EnvironmentByteCodeGen: lib/exe/bcgen
EnvironmentByteCodeLink: lib/exe/bclink
......
......@@ -15,7 +15,6 @@ Environments
EnvironmentCompiler: lib/exe/cocl::-dynamics
EnvironmentCodeGen: lib/exe/cg
EnvironmentLinker: /usr/bin/gcc|lib/exe/itasks-web-collector
EnvironmentDynLink: /usr/bin/gcc
EnvironmentABCOptimise: lib/exe/abcopt
EnvironmentByteCodeGen: lib/exe/bcgen
EnvironmentByteCodeLink: lib/exe/bclink
......
......@@ -15,7 +15,6 @@ Environments
EnvironmentCompiler: lib/exe/cocl-tonic::-dynamics -tonic
EnvironmentCodeGen: lib/exe/cg
EnvironmentLinker: /usr/bin/gcc|lib/exe/itasks-web-collector
EnvironmentDynLink: /usr/bin/gcc
EnvironmentABCOptimise: lib/exe/abcopt
EnvironmentByteCodeGen: lib/exe/bcgen
EnvironmentByteCodeLink: lib/exe/bclink
......
......@@ -15,7 +15,6 @@ Environments
EnvironmentCompiler: lib/exe/cocl::-dynamics
EnvironmentCodeGen: lib/exe/cg
EnvironmentLinker: /usr/bin/gcc|lib/exe/itasks-web-collector
EnvironmentDynLink: /usr/bin/gcc
EnvironmentABCOptimise: lib/exe/abcopt
EnvironmentByteCodeGen: lib/exe/bcgen
EnvironmentByteCodeLink: lib/exe/bclink
......
......@@ -8,7 +8,7 @@ if [ -w "$CLEAN_HOME"/etc/IDEEnvs ]; then
sed -n -i.bak '/EnvironmentName:\tiTasks/q;p' "$CLEAN_HOME"/etc/IDEEnvs
tail -n +3 Config/linux-x64/iTasks.env >> "$CLEAN_HOME"/etc/IDEEnvs
sed -i.bak "s|{Application}/lib/iTasks|$(pwd)/Libraries|g" "$CLEAN_HOME"/etc/IDEEnvs
sed -i.bak 's#EnvironmentLinker: lib/exe/linker#&::-lmysqlclient -lsqlite3#g' "$CLEAN_HOME"/etc/IDEEnvs
sed -i.bak 's#EnvironmentLinker: /usr/bin/gcc::#&-lmysqlclient -lsqlite3 #g' "$CLEAN_HOME"/etc/IDEEnvs
sed -i.bak 's|EnvironmentCompiler: lib/exe/cocl:|&-h 2048m|g' "$CLEAN_HOME"/etc/IDEEnvs
fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment