manual application of wonky patch from #1331

parrot · Jan 24, 2011 · 3b85078 · 3b85078 · leto · Feb 8, 2011
1 parent bdd6fb4
commit 3b85078
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
@@ -543,7 +543,7 @@ INSTALLABLEOPS2C    = .@slash@installable_ops2c$(EXE)
 
 # Libraries
 LIBPARROT_STATIC    = @blib_dir@/@libparrot_static@
-#IF(darwin):export DYLD_LIBRARY_PATH := @blib_dir@:$(DYLD_LIBRARY_PATH)
+#IF(darwin):export DYLD_LIBRARY_PATH := @build_dir@/@blib_dir@:$(DYLD_LIBRARY_PATH)
 #IF(win32):LIBPARROT_SHARED  = @libparrot_shared@
 #ELSE:LIBPARROT_SHARED  = @blib_dir@/@libparrot_shared@
 

diff --git a/config/init/hints/darwin.pm b/config/init/hints/darwin.pm
@@ -48,6 +48,9 @@ sub runstep {
     if ($ENV{'MACOSX_DEPLOYMENT_TARGET'} eq '10.6') {
         $flagsref->{ccflags} .= ' -pipe -fno-common ';
     }
+    elsif ($ENV{'MACOSX_DEPLOYMENT_TARGET'} eq '10.5') {
+        $flagsref->{ccflags} .= ' -pipe -fno-common ';
+    }
     else {
         $flagsref->{ccflags} .= ' -pipe -fno-common -Wno-long-double ';
     }