From c6d368b789ec725712562aa1be8bf1fe4b3d159f Mon Sep 17 00:00:00 2001
From: Norayr Chilingarian <noch@Stewarts-MacBook-Pro.local>
Date: Fri, 21 Mar 2014 06:53:33 +0800
Subject: [PATCH] static and dynamic linking works on macosx -- noch

Former-commit-id: 87f7119dfd52ebe995b4382383441368fe116c35
---
 makefile.darwin.clang.x86_64      |   2 +-
 ocat                              | Bin 151012 -> 151012 bytes
 showdef.REMOVED.git-id            |   2 +-
 src/voc/darwin/clang/extTools.Mod |  28 ++++++++++++++++++++++++----
 voc.REMOVED.git-id                |   2 +-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/makefile.darwin.clang.x86_64 b/makefile.darwin.clang.x86_64
index 5a0dd466..9649f0e0 100644
--- a/makefile.darwin.clang.x86_64
+++ b/makefile.darwin.clang.x86_64
@@ -30,7 +30,7 @@ CCOPT = -fPIC $(INCLUDEPATH) -g
 
 CC = cc $(CCOPT) -c 
 CL = cc $(CCOPT) 
-LD = cc -dynamiclib -o $(LIBRARY).dylib
+LD = libtool -dynamic -lSystem -compatibility_version $(RELEASE) -current_version $(RELEASE) -install_name $(PREFIX)/lib/$(LIBRARY).dylib -o $(LIBRARY).dylib
 # s is necessary to create index inside a archive
 ARCHIVE = ar rcs $(LIBRARY).a
 
diff --git a/ocat b/ocat
index 53abd5733a989b7bc7d8555d19c575dbf55d3eb3..a4727826442f2ef7b4d37096433a67cff723316d 100755
GIT binary patch
delta 148
zcmaDdoAb$R&W0_F6^EFv7i_OO#F)p(bgf|ftHX@zxIv6r=Na{wK#Wrt8Q*~!yRI<$
zff-!a8S|JyQdPGY`#>Vox$XiPKzbI0-mZ0z(GF}})_ul4u+m?T81;BSdbHj%`av{*
VVr<uBOHE8QNJ-t!F2i)!5C9YAKGgsK

delta 148
zcmaDdoAb$R&W0_F6^EFjeYaN~V$5S?it^q5>M-LvZV+SEc}6`Z5aZNE#&=-Gt}Bdw
zU<TK9#yn<_RMjoUK9I<CuDd`6ke&shw`<*Fv;!NLb)T^htn}9-Mm-*o9<BF`eh|%{
V7~3`3ERvHfQVh1U%P`$F1OREAHOK$}

diff --git a/showdef.REMOVED.git-id b/showdef.REMOVED.git-id
index 8fb01590..f32b26e8 100644
--- a/showdef.REMOVED.git-id
+++ b/showdef.REMOVED.git-id
@@ -1 +1 @@
-e8af78b5707b8f0816fecddad5ea39c74d2d8244
\ No newline at end of file
+3ef157af2be64fd212c0769a459038c8a8df67cb
\ No newline at end of file
diff --git a/src/voc/darwin/clang/extTools.Mod b/src/voc/darwin/clang/extTools.Mod
index 0dda5009..d8d03c6d 100644
--- a/src/voc/darwin/clang/extTools.Mod
+++ b/src/voc/darwin/clang/extTools.Mod
@@ -33,6 +33,8 @@ cc : ARRAY 1023 OF CHAR;
 ccopt : ARRAY 1023 OF CHAR;
 cmd : ARRAY 1023 OF CHAR;
 ext : ARRAY 5 OF CHAR;
+
+cmd2 : ARRAY 1023 OF CHAR;
 BEGIN
 (*
 gcc -g -o hello hello.c -I $RPATH/src/lib/system/linux/gnuc/x86_64 -I. -I$RPATH -lOberon -L. -L$RPATH -static
@@ -46,13 +48,34 @@ Strings.Append(" ", cmd);
 Strings.Append(m, cmd);
 Strings.Append(ext, cmd);
 Strings.Append(additionalopts, cmd);
-IF statically THEN Strings.Append(" -static ", cmd) END;
+Strings.Append(" ", cmd);
+(*IF statically THEN Strings.Append(" -static ", cmd) END;*)
+IF statically THEN 
+   Strings.Append(version.prefix, cmd);
+   Strings.Append("/lib/libVishapOberon.a ", cmd);
+END;
 Strings.Append(" -o ", cmd);
 Strings.Append(m, cmd);
 Strings.Append(" ", cmd);
+IF ~statically THEN
+Strings.Append ("-lVishapOberon -L. -L", ccOpt);
+Strings.Append (version.prefix, ccOpt);
+Strings.Append ("/lib ", ccOpt);
+END;
 Strings.Append(ccOpt, cmd);
+
 Console.Ln; Console.String(cmd); Console.Ln; (* may be it's feasible to add debug mode later *)
 Unix.system(cmd);
+
+IF ~statically THEN
+   cmd2 := "";
+   COPY ("install_name_tool -change libVishapOberon.dylib ", cmd2);
+   Strings.Append(version.prefix, cmd2);
+   Strings.Append ("/lib/libVishapOberon.dylib ", cmd2);
+   Strings.Append (m, cmd2);
+   Console.String(cmd2); Console.Ln;
+   Unix.system(cmd2);
+   END
 END LinkMain;
 
 BEGIN
@@ -70,9 +93,6 @@ Strings.Append(version.prefix, tmp1);
 Strings.Append("/", tmp1);
 Strings.Append(incPath1, tmp1);
 Strings.Append(tmp1, ccOpt);
-Strings.Append ("-lVishapOberon -L. -L", ccOpt);
-Strings.Append (version.prefix, ccOpt);
-Strings.Append ("/lib ", ccOpt);
 Args.GetEnv("CFLAGS", CFLAGS);
 Strings.Append (CFLAGS, ccOpt);
 Strings.Append (" ", ccOpt);
diff --git a/voc.REMOVED.git-id b/voc.REMOVED.git-id
index 8fa5f368..2dbf24f0 100644
--- a/voc.REMOVED.git-id
+++ b/voc.REMOVED.git-id
@@ -1 +1 @@
-5bcb7b99908985fea35cb5cd71f1b487bed8d413
\ No newline at end of file
+e91f0b6f185262ec480f9e15ef238542f7c6f09c
\ No newline at end of file