Skip to content

Commit

Permalink
BUILDBOT: Correct builder for new iOS clang toolchain.
Browse files Browse the repository at this point in the history
Minor incorrect usage for staticlibpath passed to configure.
Removal of all parameters which are now uneeded as the SDK wrapper
script deals with this.
  • Loading branch information
digitall committed Apr 19, 2014
1 parent 7d50c97 commit 5dea9bc
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions config/master.cfg
Expand Up @@ -579,15 +579,13 @@ scumm_libdir_iphone_clang = "%s/iPhoneOS3.1.2.sdk/usr/local" % scumm_root_iphone
scumm_env_iphone_clang = copy.deepcopy(scumm_env)
scumm_env_iphone_clang["PATH"] = "%s/bin:%s" % (scumm_root_iphone_clang, DEFAULT_PATH)
scumm_env_iphone_clang["CXX"] = "ccache ios-clang++"
scumm_env_iphone_clang["CXXFLAGS"] = "-isystem %s/include -isystem %s/iPhoneOS3.1.2.sdk/usr/include/c++/4.0.0/ -isystem %s/iPhoneOS3.1.2.sdk/usr/include/c++/4.0.0/arm-apple-darwin9" % (scumm_libdir_iphone_clang, scumm_root_iphone_clang, scumm_root_iphone_clang )
scumm_env_iphone_clang["LDFLAGS"] = "-F%s/iPhoneOS3.1.2.sdk/System/Library/PrivateFrameworks -bind_at_load -L%s/lib" % (scumm_root_iphone_clang, scumm_libdir_iphone_clang)
scumm_env_iphone_clang["LIBDIR"] = scumm_libdir_iphone_clang
scumm_env_iphone_clang["CODESIGN_ALLOCATE"] = "%s/bin/arm-apple-darwin9-codesign_allocate" % scumm_root_iphone_clang
scumm_env_iphone_clang["CXXFLAGS"] = "-I%s/include" % scumm_libdir_iphone_clang
scumm_env_iphone_clang["LDFLAGS"] = "-L%s/lib" % scumm_libdir_iphone_clang

p = {
"configureargs": [
"--host=iphone",
"--with-staticlib-prefix=%s" % scumm_libdir_iphone,
"--with-staticlib-prefix=%s" % scumm_libdir_iphone_clang,
],
"env": scumm_env_iphone,
"disttarget": "iphonebundle",
Expand Down

0 comments on commit 5dea9bc

Please sign in to comment.