# HG changeset patch
# Parent  0ab20c6cedcba7a1ddd2caa18f5f24cbe6b27d49

diff --git a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/LinkerConfiguration.java b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/LinkerConfiguration.java
--- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/LinkerConfiguration.java
+++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/LinkerConfiguration.java
@@ -90,6 +90,7 @@
         output = new StringConfiguration(null, ""); // NOI18N
         additionalLibs = new VectorConfiguration<>(null);
         dynamicSearch = new VectorConfiguration<>(null);
+
         stripOption = new BooleanConfiguration(false); // NOI18N
         picOption = new BooleanConfiguration(true); // NOI18N
         norunpathOption = new BooleanConfiguration(true); // NOI18N
@@ -101,6 +102,9 @@
         
         boolean isMac = makeConfiguration.getDevelopmentHost().getBuildPlatform() == PlatformTypes.PLATFORM_MACOSX;
         copyLibrariesConfiguration = new BooleanConfiguration(isMac);
+        if (isMac) {
+            dynamicSearch.add(".");
+        }
         
         tool = new StringConfiguration(null, ""); // NOI18N
         runTimeSearchPath = new IntConfiguration(null, SEARCH_PATH_RELATIVE_TO_WORKING_DIR, SEARCH_PATH_NAMES, null);
diff --git a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java
--- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java
+++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java
@@ -557,7 +557,7 @@
 //        if (conf.isLinkerConfiguration() && conf.getLinkerConfiguration().getCopyLibrariesConfiguration().getValue()) {
 //            explicitDot = " -L. -L${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}";
 //        }
-        bw.write("LDLIBSOPTIONS=-Wl,-rpath,'.' " + oicLibOptionsPrefix + conf.getLinkerConfiguration().getLibraryItems() + oicLibOptionsPostfix + explicitDot + "\n"); // NOI18N
+        bw.write("LDLIBSOPTIONS=" + oicLibOptionsPrefix + conf.getLinkerConfiguration().getLibraryItems() + oicLibOptionsPostfix + explicitDot + "\n"); // NOI18N
         bw.write("\n"); // NOI18N
 
         if (conf.isQmakeConfiguration()) {