Index: src/untrusted/ehsupport/nacl.scons |
diff --git a/src/untrusted/ehsupport/nacl.scons b/src/untrusted/ehsupport/nacl.scons |
index 282ba5ce33d3cea2dab87cfbaa2311ec1402c0ad..ab17f0c4e4eb705b52de7e7dcc8e166f836f7b1f 100644 |
--- a/src/untrusted/ehsupport/nacl.scons |
+++ b/src/untrusted/ehsupport/nacl.scons |
@@ -8,26 +8,13 @@ Import('env') |
if not env.Bit('bitcode'): |
Return() |
-def GetPlatformSuffix(env): |
- platform = env.get('TARGET_FULLARCH') |
- assert platform in ['x86-32', 'x86-64', 'arm'] |
- # we do not like hyphens in file names |
- return platform.replace('-', '_') |
- |
-platform = GetPlatformSuffix(env) |
- |
# NOTE: we make sure everything in this directory gets compiled |
# all the way down into native code. |
native_env = env.Clone() |
- |
-native_env.Replace(OBJSUFFIX='.o') |
-native_env.Replace(SHLIBSUFFIX='.so') |
+native_env.AddBiasForPNaCl() |
+native_env.PNaClForceNative() |
native_env.Replace(LINK=native_env['C_ONLY_LINK']) |
-native_env.Append(CCFLAGS=['-arch', '${TARGET_FULLARCH}', |
- '--pnacl-allow-translate']) |
-native_env.Append(LINKFLAGS=['-arch', '${TARGET_FULLARCH}', |
- '--pnacl-allow-native', |
- # TODO(pdox): This flag shouldn't be necessary, |
+native_env.Append(LINKFLAGS=[# TODO(pdox): This flag shouldn't be necessary, |
# the driver should be able to detect when there |
# are no bitcode inputs. |
'--pnacl-native-hack']) |